cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix for #16518 - added missing regions

Browse source
This commit is contained in:
Hrishikesh Barua 2016-06-30 17:53:15 +05:30 committed by Matt Clay
parent 1a4804cc60
commit cf9bfc3459
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/cloud/amazon/_ec2_ami_search.py
View file

@ -56,9 +56,9 @@ options:
description: EC2 region
required: false
default: us-east-1
choices: ["ap-northeast-1", "ap-southeast-1", "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"]
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"]
virt:
description: virutalization type
required: false
@ -88,7 +88,9 @@ SUPPORTED_DISTROS = ['ubuntu']
AWS_REGIONS = ['ap-northeast-1',
'ap-southeast-1',
'ap-northeast-2',
'ap-southeast-2',
'ap-south-1',
'eu-central-1',
'eu-west-1',
'sa-east-1',

1
lib/ansible/modules/cloud/amazon/ec2_facts.py
View file

@ -64,6 +64,7 @@ class Ec2Metadata(object):
'ap-northeast-2',
'ap-southeast-1',
'ap-southeast-2',
'ap-south-1',
'eu-central-1',
'eu-west-1',
'sa-east-1',