From 14ba10393bc311ff26c64ebe0602084eb8d4c743 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Wed, 26 Feb 2014 15:40:33 -0600 Subject: [PATCH] Minor tweak to region config in boto configuration file --- lib/ansible/module_utils/ec2.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ansible/module_utils/ec2.py b/lib/ansible/module_utils/ec2.py index 20543f749f6..9156df766b2 100644 --- a/lib/ansible/module_utils/ec2.py +++ b/lib/ansible/module_utils/ec2.py @@ -71,7 +71,9 @@ def get_ec2_creds(module): region = os.environ['AWS_REGION'] else: # boto.config.get returns None if config not found - region = boto.config.get('Boto', 'ec2_region_name') + region = boto.config.get('Boto', 'aws_region') + if not region: + region = boto.config.get('Boto', 'ec2_region') return ec2_url, ec2_access_key, ec2_secret_key, region