wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pick up default EC2 region from boto.config

Browse source 
This doesn't account for boto configs where e.g. RDS has one
default region and EC2 another - all will default to `ec2_region_name`.

However, this is just handy to allow an easy site wide default
region if existing configuration already relies on it.

Modules can be improved to mention this in the documentation and
turn off required=True where needed. But it works with `ec2`
and `ec2_vol` without change.
This commit is contained in:
Will Thames 2014-02-07 22:30:16 +10:00
parent 0bc0315171
commit d5c309e20d
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

@ -53,6 +53,9 @@ def get_ec2_creds(module):
region = os.environ['EC2_REGION'] region = os.environ['EC2_REGION']
elif 'AWS_REGION' in os.environ: elif 'AWS_REGION' in os.environ:
region = os.environ['AWS_REGION'] 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 return ec2_url, ec2_access_key, ec2_secret_key, region