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

Merge pull request from dougluce/fix-s3-region-error

Browse source 
Fix S3 unavailable region error
This commit is contained in:
Chris Houseknecht 2016-05-27 13:41:29 -04:00
commit 90e8a36d4c
1 changed files with 4 additions and 3 deletions

7
cloud/amazon/s3.py Normal file → Executable file
View file

@ -460,9 +460,10 @@ def main():
s3 = boto.connect_walrus(walrus, **aws_connect_kwargs)
else:
aws_connect_kwargs['is_secure'] = True
s3 = connect_to_aws(boto.s3, location, **aws_connect_kwargs)
# use this as fallback because connect_to_region seems to fail in boto + non 'classic' aws accounts in some cases
if s3 is None:
try:
s3 = connect_to_aws(boto.s3, location, **aws_connect_kwargs)
except AnsibleAWSError:
# use this as fallback because connect_to_region seems to fail in boto + non 'classic' aws accounts in some cases
s3 = boto.connect_s3(**aws_connect_kwargs)
except boto.exception.NoAuthHandlerFound, e: