From d27b73e7b59fbd334bde98ad22d32a96c305e827 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 21 Sep 2015 14:09:20 -0400 Subject: [PATCH] fixed case in which boto3 is present but module is not using it yet --- lib/ansible/module_utils/ec2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/ec2.py b/lib/ansible/module_utils/ec2.py index f264ef8fdf6..14a8676b598 100644 --- a/lib/ansible/module_utils/ec2.py +++ b/lib/ansible/module_utils/ec2.py @@ -80,7 +80,7 @@ def boto_supports_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 # access_key @@ -141,7 +141,7 @@ def get_aws_connection_info(module): # in case security_token came in as empty string security_token = None - if HAS_BOTO3: + if HAS_BOTO3 and boto3: boto_params = dict(aws_access_key_id=access_key, aws_secret_access_key=secret_key, aws_session_token=security_token)