From a5145a41a863643f8fa63a0ff975595b2148c1e9 Mon Sep 17 00:00:00 2001 From: joernheissler Date: Fri, 30 Dec 2016 16:32:21 +0100 Subject: [PATCH] Add 3 new Amazon AWS regions (#19687) --- lib/ansible/modules/cloud/amazon/_ec2_ami_search.py | 9 ++++++--- lib/ansible/modules/cloud/amazon/ec2_facts.py | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py index a497ab851d9..04c54db46ac 100644 --- a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py +++ b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py @@ -61,8 +61,9 @@ options: required: false default: us-east-1 choices: ["ap-northeast-1", "ap-southeast-1", "ap-northeast-2", - "ap-southeast-2", "eu-central-1", "eu-west-1", "sa-east-1", - "us-east-1", "us-west-1", "us-west-2", "us-gov-west-1"] + "ap-southeast-2", "ca-central-1", "eu-central-1", "eu-west-1", + "eu-west-2", "sa-east-1", "us-east-1", "us-east-2", "us-west-1", + "us-west-2", "us-gov-west-1"] virt: description: virutalization type required: false @@ -103,15 +104,17 @@ AWS_REGIONS = ['ap-northeast-1', 'ap-northeast-2', 'ap-southeast-2', 'ap-south-1', + 'ca-central-1', 'eu-central-1', 'eu-west-1', + 'eu-west-2', 'sa-east-1', 'us-east-1', + 'us-east-2', 'us-west-1', 'us-west-2', "us-gov-west-1"] - def get_url(module, url): """ Get url and return response """ diff --git a/lib/ansible/modules/cloud/amazon/ec2_facts.py b/lib/ansible/modules/cloud/amazon/ec2_facts.py index c3c2e0d616d..21462ffc653 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_facts.py +++ b/lib/ansible/modules/cloud/amazon/ec2_facts.py @@ -73,8 +73,10 @@ class Ec2Metadata(object): 'ca-central-1', 'eu-central-1', 'eu-west-1', + 'eu-west-2', 'sa-east-1', 'us-east-1', + 'us-east-2', 'us-west-1', 'us-west-2', 'us-gov-west-1'