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

Updating module_utils/ec2.py in v2 with version from v1

Browse source
This commit is contained in:
James Cammarata 2015-04-27 11:37:49 -05:00
parent 49bf70ed94
commit 8d174e7044
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
v2/ansible/module_utils/ec2.py
View file

@ -33,13 +33,14 @@ except:
HAS_LOOSE_VERSION = False HAS_LOOSE_VERSION = False
def aws_common_argument_spec(): def aws_common_argument_spec():
return dict( return dict(
ec2_url=dict(), ec2_url=dict(),
aws_secret_key=dict(aliases=['ec2_secret_key', 'secret_key'], no_log=True), aws_secret_key=dict(aliases=['ec2_secret_key', 'secret_key'], no_log=True),
aws_access_key=dict(aliases=['ec2_access_key', 'access_key']), aws_access_key=dict(aliases=['ec2_access_key', 'access_key']),
validate_certs=dict(default=True, type='bool'), validate_certs=dict(default=True, type='bool'),
security_token=dict(no_log=True), security_token=dict(aliases=['access_token'], no_log=True),
profile=dict(), profile=dict(),
) )
@ -72,38 +73,38 @@ def get_aws_connection_info(module):
validate_certs = module.params.get('validate_certs') validate_certs = module.params.get('validate_certs')
if not ec2_url: if not ec2_url:
if 'EC2_URL' in os.environ: if 'AWS_URL' in os.environ:
ec2_url = os.environ['EC2_URL']
elif 'AWS_URL' in os.environ:
ec2_url = os.environ['AWS_URL'] ec2_url = os.environ['AWS_URL']
elif 'EC2_URL' in os.environ:
ec2_url = os.environ['EC2_URL']
if not access_key: if not access_key:
if 'EC2_ACCESS_KEY' in os.environ: if 'AWS_ACCESS_KEY_ID' in os.environ:
access_key = os.environ['EC2_ACCESS_KEY']
elif 'AWS_ACCESS_KEY_ID' in os.environ:
access_key = os.environ['AWS_ACCESS_KEY_ID'] access_key = os.environ['AWS_ACCESS_KEY_ID']
elif 'AWS_ACCESS_KEY' in os.environ: elif 'AWS_ACCESS_KEY' in os.environ:
access_key = os.environ['AWS_ACCESS_KEY'] access_key = os.environ['AWS_ACCESS_KEY']
elif 'EC2_ACCESS_KEY' in os.environ:
access_key = os.environ['EC2_ACCESS_KEY']
else: else:
# in case access_key came in as empty string # in case access_key came in as empty string
access_key = None access_key = None
if not secret_key: if not secret_key:
if 'EC2_SECRET_KEY' in os.environ: if 'AWS_SECRET_ACCESS_KEY' in os.environ:
secret_key = os.environ['EC2_SECRET_KEY']
elif 'AWS_SECRET_ACCESS_KEY' in os.environ:
secret_key = os.environ['AWS_SECRET_ACCESS_KEY'] secret_key = os.environ['AWS_SECRET_ACCESS_KEY']
elif 'AWS_SECRET_KEY' in os.environ: elif 'AWS_SECRET_KEY' in os.environ:
secret_key = os.environ['AWS_SECRET_KEY'] secret_key = os.environ['AWS_SECRET_KEY']
elif 'EC2_SECRET_KEY' in os.environ:
secret_key = os.environ['EC2_SECRET_KEY']
else: else:
# in case secret_key came in as empty string # in case secret_key came in as empty string
secret_key = None secret_key = None
if not region: if not region:
if 'EC2_REGION' in os.environ: if 'AWS_REGION' in os.environ:
region = os.environ['EC2_REGION']
elif 'AWS_REGION' in os.environ:
region = os.environ['AWS_REGION'] region = os.environ['AWS_REGION']
elif 'EC2_REGION' in os.environ:
region = os.environ['EC2_REGION']
else: else:
# boto.config.get returns None if config not found # boto.config.get returns None if config not found
region = boto.config.get('Boto', 'aws_region') region = boto.config.get('Boto', 'aws_region')
@ -113,6 +114,8 @@ def get_aws_connection_info(module):
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']
elif 'EC2_SECURITY_TOKEN' in os.environ:
security_token = os.environ['EC2_SECURITY_TOKEN']
else: else:
# in case security_token came in as empty string # in case security_token came in as empty string
security_token = None security_token = None