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

simpler conditional

Browse source
This commit is contained in:
Brian Coca 2016-01-25 22:01:48 -05:00
parent e3a58a883a
commit 9df0662408
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,12 +144,12 @@ def get_aws_connection_info(module, boto3=False):
region = boto.config.get('Boto', 'aws_region') region = boto.config.get('Boto', 'aws_region')
if not region: if not region:
region = boto.config.get('Boto', 'ec2_region') region = boto.config.get('Boto', 'ec2_region')
elif boto3 and HAS_BOTO3: elif HAS_BOTO3:
# here we don't need to make an additional call, will default to 'us-east-1' if the below evaluates to None. # here we don't need to make an additional call, will default to 'us-east-1' if the below evaluates to None.
region = botocore.session.get_session().get_config_variable('region') region = botocore.session.get_session().get_config_variable('region')
elif boto3 and not HAS_BOTO3: else:
module.fail_json("Boto3 is required for this module. Please install boto3 and try again") module.fail_json("Boto3 is required for this module. Please install boto3 and try again")
if not security_token: if not security_token:
if 'AWS_SECURITY_TOKEN' in os.environ: if 'AWS_SECURITY_TOKEN' in os.environ:
security_token = os.environ['AWS_SECURITY_TOKEN'] security_token = os.environ['AWS_SECURITY_TOKEN']