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

fixed case in which boto3 is present but module is not using it yet

Browse source
This commit is contained in:
Brian Coca 2015-09-21 14:09:20 -04:00
parent cc646c0a82
commit d27b73e7b5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/ec2.py
View file

@ -80,7 +80,7 @@ def boto_supports_profile_name():
return hasattr(boto.ec2.EC2Connection, 'profile_name') return hasattr(boto.ec2.EC2Connection, 'profile_name')
def get_aws_connection_info(module): def get_aws_connection_info(module, boto3=False):
# Check module args for credentials, then check environment vars # Check module args for credentials, then check environment vars
# access_key # access_key
@ -141,7 +141,7 @@ def get_aws_connection_info(module):
# in case security_token came in as empty string # in case security_token came in as empty string
security_token = None security_token = None
if HAS_BOTO3: if HAS_BOTO3 and boto3:
boto_params = dict(aws_access_key_id=access_key, boto_params = dict(aws_access_key_id=access_key,
aws_secret_access_key=secret_key, aws_secret_access_key=secret_key,
aws_session_token=security_token) aws_session_token=security_token)