diff options
author | Will Thames <will@thames.id.au> | 2014-11-01 12:44:44 +1000 |
---|---|---|
committer | Will Thames <will@thames.id.au> | 2014-11-22 11:35:46 +1000 |
commit | 30c7f9a7d377cd225f2e0e43b0990839867d561b (patch) | |
tree | e566c444457b38c2cd03d3f83f347cf62edad2b2 /cloud/amazon/ec2_facts.py | |
parent | 19b328c4df2157b6c0191e9144236643ce2be890 (diff) | |
download | ansible-modules-core-30c7f9a7d377cd225f2e0e43b0990839867d561b.tar.gz |
Added better region handling and enabled eu-central-1
Make use of improved connect_to_aws that throws an exception
if a region can't be connected to (e.g. eu-central-1 requires
boto 2.34 onwards)
Add eu-central-1 to the two modules that hardcode their regions
Add us-gov-west-1 to ec2_ami_search to match documentation!
This pull request makes use of the changes in ansible/ansible#9419
Diffstat (limited to 'cloud/amazon/ec2_facts.py')
-rw-r--r-- | cloud/amazon/ec2_facts.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cloud/amazon/ec2_facts.py b/cloud/amazon/ec2_facts.py index 7b5c610d..c6fbf86b 100644 --- a/cloud/amazon/ec2_facts.py +++ b/cloud/amazon/ec2_facts.py @@ -65,6 +65,7 @@ class Ec2Metadata(object): AWS_REGIONS = ('ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', + 'eu-central-1', 'eu-west-1', 'sa-east-1', 'us-east-1', |