cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove duplicate logic

Browse source
This commit is contained in:
Val Komarov 2015-10-14 15:54:04 -04:00 committed by Matt Clay
parent 11f66c0742
commit 0b294d69c5
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/cloud/amazon/s3.py
View file

@ -416,17 +416,11 @@ def main():
if acl not in CannedACLStrings: if acl not in CannedACLStrings:
module.fail_json(msg='Unknown permission specified: %s' % str(acl)) module.fail_json(msg='Unknown permission specified: %s' % str(acl))
if overwrite not in ['always', 'never', 'different']: if overwrite not in ['always', 'never', 'different']:
if module.boolean(overwrite): if module.boolean(overwrite):
overwrite = 'always' overwrite = 'always'
else: else:
overwrite='never' overwrite = 'never'
if overwrite not in ['always', 'never', 'different']:
if module.boolean(overwrite):
overwrite = 'always'
else:
overwrite='never'
region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module) region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module)