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

pull/6199/head
James Cammarata 11 years ago
commit 88acb48e61

@ -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

Loading…
Cancel
Save