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

Merge pull request #1561 from micxer/iam_policy-fix

Browse source 
Fix connection creation in iam_policy module to allow usage of profiles with boto
This commit is contained in:
Toshio Kuratomi 2015-06-30 13:39:32 -07:00
commit 8f74a73713
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cloud/amazon/iam_policy.py
View file

@ -115,6 +115,7 @@ import urllib
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
@ -293,13 +294,10 @@ def main():
else: else:
pdoc=None pdoc=None
ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module) region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module)
try: try:
iam = boto.iam.connection.IAMConnection( iam = boto.iam.connection.IAMConnection(**aws_connect_kwargs)
aws_access_key_id=aws_access_key,
aws_secret_access_key=aws_secret_key,
)
except boto.exception.NoAuthHandlerFound, e: except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))