External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3751 from wenottingham/OH-IO

Browse Source 
Add new AWS regions.
This commit is contained in:
Bill Nottingham
2016-10-20 10:14:31 -04:00
committed by GitHub
parent 6080ecceca 94b20d4fc6
commit cced987862
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/settings/defaults.py
View File

@@ -532,6 +532,7 @@ INV_ENV_VARIABLE_BLACKLIST = ("HOME", "USER", "_", "TERM")
# http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region # http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region
EC2_REGION_NAMES = { EC2_REGION_NAMES = {
'us-east-1': 'US East (Northern Virginia)', 'us-east-1': 'US East (Northern Virginia)',
'us-east-2': 'US East (Ohio)',
'us-west-2': 'US West (Oregon)', 'us-west-2': 'US West (Oregon)',
'us-west-1': 'US West (Northern California)', 'us-west-1': 'US West (Northern California)',
'eu-central-1': 'EU (Frankfurt)', 'eu-central-1': 'EU (Frankfurt)',
@@ -540,6 +541,7 @@ EC2_REGION_NAMES = {
'ap-southeast-2': 'Asia Pacific (Sydney)', 'ap-southeast-2': 'Asia Pacific (Sydney)',
'ap-northeast-1': 'Asia Pacific (Tokyo)', 'ap-northeast-1': 'Asia Pacific (Tokyo)',
'ap-northeast-2': 'Asia Pacific (Seoul)', 'ap-northeast-2': 'Asia Pacific (Seoul)',
'ap-south-1': 'Asia Pacific (Mumbai)',
'sa-east-1': 'South America (Sao Paulo)', 'sa-east-1': 'South America (Sao Paulo)',
'us-gov-west-1': 'US West (GovCloud)', 'us-gov-west-1': 'US West (GovCloud)',
'cn-north-1': 'China (Beijing)', 'cn-north-1': 'China (Beijing)',

2
requirements/requirements.txt
View File

@@ -5,7 +5,7 @@ appdirs==1.4.0
azure==2.0.0rc2 azure==2.0.0rc2
Babel==2.2.0 Babel==2.2.0
billiard==3.3.0.16 billiard==3.3.0.16
boto==2.40.0 boto==2.43.0
celery==3.1.10 celery==3.1.10
cliff==1.15.0 cliff==1.15.0
cmd2==0.6.8 cmd2==0.6.8

2
requirements/requirements_ansible.txt
View File

@@ -3,7 +3,7 @@ apache-libcloud==0.20.1
appdirs==1.4.0 appdirs==1.4.0
azure==2.0.0rc5 azure==2.0.0rc5
Babel==2.2.0 Babel==2.2.0
boto==2.40.0 boto==2.43.0
cliff==1.15.0 cliff==1.15.0
cmd2==0.6.8 cmd2==0.6.8
cryptography==1.3.2 cryptography==1.3.2