From 9df06624084f55b1adaff04a93008bb0ae0a3693 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 25 Jan 2016 22:01:48 -0500 Subject: [PATCH] simpler conditional --- lib/ansible/module_utils/ec2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/module_utils/ec2.py b/lib/ansible/module_utils/ec2.py index 7a30955db8..2263ad86f4 100644 --- a/lib/ansible/module_utils/ec2.py +++ b/lib/ansible/module_utils/ec2.py @@ -144,12 +144,12 @@ def get_aws_connection_info(module, boto3=False): region = boto.config.get('Boto', 'aws_region') if not 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. 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") - + if not security_token: if 'AWS_SECURITY_TOKEN' in os.environ: security_token = os.environ['AWS_SECURITY_TOKEN']