archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't fail if ec2_access_key/ec2_secret_key not specified to use IAM role.

Browse Source
pull/4803/head
dragon3 12 years ago
parent 9972265fd3
commit ff5bd7fe06
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File

4
lib/ansible/module_utils/ec2.py
Unescape Escape View File

@ -18,16 +18,12 @@ def get_ec2_creds(module):
ec2_access_key = os.environ['EC2_ACCESS_KEY'] ec2_access_key = os.environ['EC2_ACCESS_KEY']
elif 'AWS_ACCESS_KEY' in os.environ: elif 'AWS_ACCESS_KEY' in os.environ:
ec2_access_key = os.environ['AWS_ACCESS_KEY'] ec2_access_key = os.environ['AWS_ACCESS_KEY']
else:
module.fail_json(msg="Please specify an ec2_access_key")
if not ec2_secret_key: if not ec2_secret_key:
if 'EC2_SECRET_KEY' in os.environ: if 'EC2_SECRET_KEY' in os.environ:
ec2_secret_key = os.environ['EC2_SECRET_KEY'] ec2_secret_key = os.environ['EC2_SECRET_KEY']
elif 'AWS_SECRET_KEY' in os.environ: elif 'AWS_SECRET_KEY' in os.environ:
ec2_secret_key = os.environ['AWS_SECRET_KEY'] ec2_secret_key = os.environ['AWS_SECRET_KEY']
else:
module.fail_json(msg="Please specify an ec2_secret_key")
if not region: if not region:
if 'EC2_REGION' in os.environ: if 'EC2_REGION' in os.environ:

Write Preview
Loading…
Cancel
Save