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

Patch to remove dependency on boto when only using boto3

Browse source 
Updated with explicit check for HAS_BOTO3
This commit is contained in:
Jonathan Davila 2015-11-13 18:19:09 -07:00
parent 300ee227a2
commit 1b76a9cef2
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import os
try: try:
import boto3 import boto3
import botocore
HAS_BOTO3 = True HAS_BOTO3 = True
except: except:
HAS_BOTO3 = False HAS_BOTO3 = False
@ -129,10 +130,14 @@ def get_aws_connection_info(module, boto3=False):
elif 'EC2_REGION' in os.environ: elif 'EC2_REGION' in os.environ:
region = os.environ['EC2_REGION'] region = os.environ['EC2_REGION']
else: else:
# boto.config.get returns None if config not found if not boto3:
region = boto.config.get('Boto', 'aws_region') # boto.config.get returns None if config not found
if not region: region = boto.config.get('Boto', 'aws_region')
region = boto.config.get('Boto', 'ec2_region') if not region:
region = boto.config.get('Boto', 'ec2_region')
elif boto3 and 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')
if not security_token: if not security_token:
if 'AWS_SECURITY_TOKEN' in os.environ: if 'AWS_SECURITY_TOKEN' in os.environ: