From 5c69ed2e9f166e2d7b54bfe26813b1df3057b7a6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 19 Oct 2016 16:15:09 -0400 Subject: [PATCH 1/2] More regions! --- awx/settings/defaults.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 771155a523..6711a5872b 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -532,6 +532,7 @@ INV_ENV_VARIABLE_BLACKLIST = ("HOME", "USER", "_", "TERM") # http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region EC2_REGION_NAMES = { 'us-east-1': 'US East (Northern Virginia)', + 'us-east-2': 'US East (Ohio)', 'us-west-2': 'US West (Oregon)', 'us-west-1': 'US West (Northern California)', 'eu-central-1': 'EU (Frankfurt)', @@ -540,6 +541,7 @@ EC2_REGION_NAMES = { 'ap-southeast-2': 'Asia Pacific (Sydney)', 'ap-northeast-1': 'Asia Pacific (Tokyo)', 'ap-northeast-2': 'Asia Pacific (Seoul)', + 'ap-south-1': 'Asia Pacific (Mumbai)', 'sa-east-1': 'South America (Sao Paulo)', 'us-gov-west-1': 'US West (GovCloud)', 'cn-north-1': 'China (Beijing)', From 94b20d4fc6d86144cfab0ee5d50e2a0ca324a240 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 19 Oct 2016 16:16:05 -0400 Subject: [PATCH 2/2] Also bump boto for new regions, per ryansb. --- requirements/requirements.txt | 2 +- requirements/requirements_ansible.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index a6bda0f61c..1cc458550f 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -5,7 +5,7 @@ appdirs==1.4.0 azure==2.0.0rc2 Babel==2.2.0 billiard==3.3.0.16 -boto==2.40.0 +boto==2.43.0 celery==3.1.10 cliff==1.15.0 cmd2==0.6.8 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index e62e3e5ead..4d14cd380e 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -3,7 +3,7 @@ apache-libcloud==0.20.1 appdirs==1.4.0 azure==2.0.0rc5 Babel==2.2.0 -boto==2.40.0 +boto==2.43.0 cliff==1.15.0 cmd2==0.6.8 cryptography==1.3.2