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

added patch to workaround some s3 connection faliures

Browse source
This commit is contained in:
Brian Coca 2015-03-26 11:23:32 -04:00 committed by Matt Clay
parent 252df8685a
commit 7cd7bad2e8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -335,6 +335,10 @@ def main():
s3 = boto.connect_walrus(walrus, aws_access_key, aws_secret_key)
else:
s3 = boto.s3.connect_to_region(location, aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_key, is_secure=True, calling_format=OrdinaryCallingFormat())
# use this as fallback because connect_to_region seems to fail in boto + non 'classic' aws accounts in some cases
if s3 is None:
s3 = boto.connect_s3(aws_access_key, aws_secret_key)
except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg='No Authentication Handler found: %s ' % str(e))
except Exception, e: