ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 05:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update try statement as pointed out by defionscode

Browse source
This commit is contained in:
Etherdaemon 2015-10-22 09:12:58 +10:00 • committed by Matt Clay
commit 63c8c40a37
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/modules/cloud/amazon/iam.py
View file

@ -574,7 +574,10 @@ 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:
if region:
iam = boto.iam.connect_to_region(region, **aws_connect_kwargs) iam = boto.iam.connect_to_region(region, **aws_connect_kwargs)
else:
iam = boto.iam.connection.IAMConnection(**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
lib/ansible/modules/cloud/amazon/iam_cert.py
View file

@ -245,7 +245,10 @@ 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:
if region:
iam = boto.iam.connect_to_region(region, **aws_connect_kwargs) iam = boto.iam.connect_to_region(region, **aws_connect_kwargs)
else:
iam = boto.iam.connection.IAMConnection(**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
lib/ansible/modules/cloud/amazon/iam_policy.py
View file

@ -305,7 +305,10 @@ 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:
if region:
iam = boto.iam.connect_to_region(region, **aws_connect_kwargs) iam = boto.iam.connect_to_region(region, **aws_connect_kwargs)
else:
iam = boto.iam.connection.IAMConnection(**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))