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

fixes #12831 by updating the boto iam connection method to connect_to_region

Browse source
This commit is contained in:
Etherdaemon 2015-10-20 16:38:27 +10:00
parent 14f32de7a6
commit 2b2285eb67
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cloud/amazon/iam.py
View file

@ -565,7 +565,7 @@ def main():
region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module) region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module)
try: try:
iam = boto.iam.connection.IAMConnection(**aws_connect_kwargs) iam = boto.iam.connect_to_region(region, **aws_connect_kwargs)
except boto.exception.NoAuthHandlerFound, e: except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))

3
cloud/amazon/iam_cert.py
View file

@ -107,6 +107,7 @@ import sys
try: try:
import boto import boto
import boto.iam import boto.iam
import boto.ec2
HAS_BOTO = True HAS_BOTO = True
except ImportError: except ImportError:
HAS_BOTO = False HAS_BOTO = False
@ -246,7 +247,7 @@ def main():
region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module) region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module)
try: try:
iam = boto.iam.connection.IAMConnection(**aws_connect_kwargs) iam = boto.iam.connect_to_region(region, **aws_connect_kwargs)
except boto.exception.NoAuthHandlerFound, e: except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))

2
cloud/amazon/iam_policy.py
View file

@ -307,7 +307,7 @@ def main():
region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module) region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module)
try: try:
iam = boto.iam.connection.IAMConnection(**aws_connect_kwargs) iam = boto.iam.connect_to_region(region, **aws_connect_kwargs)
except boto.exception.NoAuthHandlerFound, e: except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))