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

Add 3 new Amazon AWS regions (#19687)

Browse source
This commit is contained in:
joernheissler 2016-12-30 16:32:21 +01:00 committed by Ryan Brown
parent e2c50baf3f
commit a5145a41a8
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 """

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

@ -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'