1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge pull request #12690 from stelligent/devel

Use AWS_DEFAULT_REGION env var if none specified
This commit is contained in:
James Cammarata 2015-10-09 10:02:48 -04:00
commit f415d39dfd

View file

@ -124,6 +124,8 @@ def get_aws_connection_info(module, boto3=False):
if not region: if not region:
if 'AWS_REGION' in os.environ: if 'AWS_REGION' in os.environ:
region = os.environ['AWS_REGION'] region = os.environ['AWS_REGION']
elif 'AWS_DEFAULT_REGION' in os.environ:
region = os.environ['AWS_DEFAULT_REGION']
elif 'EC2_REGION' in os.environ: elif 'EC2_REGION' in os.environ:
region = os.environ['EC2_REGION'] region = os.environ['EC2_REGION']
else: else: