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

Remove need for unnecessary boto.ec2 import

Browse source 
Modules shouldn't need to import boto.ec2.
The check was to test if profile_name was supported by boto.
Two years after the introduction of the support, we will now
assume that if people are passing `profile`, they are using
a version of boto that supports it (this requirement is
already documented in the aws documentation fragment)

Also remove even older version check for `validate_certs`

Fixes #1901
This commit is contained in:
Will Thames 2016-03-21 10:44:40 +10:00
parent 7460f76f8d
commit f438c074af
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,10 +85,6 @@ def ec2_argument_spec():
return spec return spec
def boto_supports_profile_name():
return hasattr(boto.ec2.EC2Connection, 'profile_name')
def get_aws_connection_info(module, boto3=False): 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
@ -172,14 +168,10 @@ def get_aws_connection_info(module, boto3=False):
aws_secret_access_key=secret_key, aws_secret_access_key=secret_key,
security_token=security_token) security_token=security_token)
# profile_name only works as a key in boto >= 2.24 # only set profile_name if passed as an argument
# so only set profile_name if passed as an argument
if profile_name: if profile_name:
if not boto_supports_profile_name():
module.fail_json("boto does not support profile_name before 2.24")
boto_params['profile_name'] = profile_name boto_params['profile_name'] = profile_name
if HAS_LOOSE_VERSION and LooseVersion(boto.Version) >= LooseVersion("2.6.0"):
boto_params['validate_certs'] = validate_certs boto_params['validate_certs'] = validate_certs
for param, value in boto_params.items(): for param, value in boto_params.items():