diff options
author | Mick Bass <mick.bass@47lining.com> | 2015-03-29 21:56:44 -0600 |
---|---|---|
committer | Mick Bass <mick.bass@47lining.com> | 2015-03-29 21:56:44 -0600 |
commit | 7de97864bec4d3c904b2ae983eff40b5d6785ee9 (patch) | |
tree | 3c79f21789d48e2ac683d001d2de2657d320e751 | |
parent | 8c80900fefb7ab2b925bd7f7ccb72d1a5fb47a30 (diff) | |
download | ansible-modules-core-7de97864bec4d3c904b2ae983eff40b5d6785ee9.tar.gz |
clean rebase of https://github.com/ansible/ansible-modules-core/pull/1024 on a new branch
-rw-r--r-- | cloud/amazon/s3.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloud/amazon/s3.py b/cloud/amazon/s3.py index c24021f1..e7d017f5 100644 --- a/cloud/amazon/s3.py +++ b/cloud/amazon/s3.py @@ -320,12 +320,12 @@ def main(): ) elif is_walrus(s3_url): walrus = urlparse.urlparse(s3_url).hostname - s3 = boto.connect_walrus(walrus, aws_access_key, aws_secret_key) + s3 = boto.connect_walrus(walrus, **aws_connect_kwargs) else: - s3 = boto.s3.connection.S3Connection(calling_format=OrdinaryCallingFormat(), **aws_connect_kwargs) + s3 = boto.s3.connect_to_region(location, is_secure=True, calling_format=OrdinaryCallingFormat(), **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: - s3 = boto.connect_s3(aws_access_key, aws_secret_key) + s3 = boto.connect_s3(**aws_connect_kwargs) except boto.exception.NoAuthHandlerFound, e: module.fail_json(msg='No Authentication Handler found: %s ' % str(e)) |