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

Merge branch 'ec2_boto_config_region' of https://github.com/willthames/ansible into willthames-ec2_boto_config_region

Browse source
This commit is contained in:
James Cammarata 2014-02-26 15:32:05 -06:00
parent 2a383786dd d5c309e20d
commit 88acb48e61
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,9 @@ def get_ec2_creds(module):
region = os.environ['EC2_REGION']
elif 'AWS_REGION' in os.environ:
region = os.environ['AWS_REGION']
else:
# boto.config.get returns None if config not found
region = boto.config.get('Boto', 'ec2_region_name')
return ec2_url, ec2_access_key, ec2_secret_key, region