Merge pull request #12690 from stelligent/devel

Use AWS_DEFAULT_REGION env var if none specified
9 years ago · f415d39dfd
parent cfa62e7a2a 55b3f9e4e5
commit f415d39dfd
1 changed files with 2 additions and 0 deletions
--- a/lib/ansible/module_utils/ec2.py
+++ b/lib/ansible/module_utils/ec2.py
@ -124,6 +124,8 @@ def get_aws_connection_info(module, boto3=False):
    if not region:
        if 'AWS_REGION' in os.environ:
            region = os.environ['AWS_REGION']
        elif 'AWS_DEFAULT_REGION' in os.environ:
            region = os.environ['AWS_DEFAULT_REGION']
        elif 'EC2_REGION' in os.environ:
            region = os.environ['EC2_REGION']
        else: