From acaa8a75b261261f542d7675ffce746e47b0ed97 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 20 Dec 2016 16:24:57 -0500 Subject: [PATCH] Update boto to 2.45.0, add eu-west-2 and ca-central-1 --- awx/settings/defaults.py | 2 ++ requirements/requirements.in | 2 +- requirements/requirements.txt | 2 +- requirements/requirements_ansible.in | 2 +- requirements/requirements_ansible.txt | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index f1e51a698e..cebdde69fb 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -626,8 +626,10 @@ EC2_REGION_NAMES = { 'us-east-2': _('US East (Ohio)'), 'us-west-2': _('US West (Oregon)'), 'us-west-1': _('US West (Northern California)'), + 'ca-central-1': _('Canada (Central)'), 'eu-central-1': _('EU (Frankfurt)'), 'eu-west-1': _('EU (Ireland)'), + 'eu-west-2': _('EU (London)'), 'ap-southeast-1': _('Asia Pacific (Singapore)'), 'ap-southeast-2': _('Asia Pacific (Sydney)'), 'ap-northeast-1': _('Asia Pacific (Tokyo)'), diff --git a/requirements/requirements.in b/requirements/requirements.in index c5771d91a2..723319e86f 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -7,7 +7,7 @@ apache-libcloud==1.3.0 asgi-amqp==0.3.1 azure==2.0.0rc6 backports.ssl-match-hostname==3.5.0.1 -boto==2.43.0 +boto==2.45.0 channels==0.17.3 celery==3.1.17 Django==1.8.16 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index ba11ac0eae..d413f74101 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -41,7 +41,7 @@ backports.functools-lru-cache==1.3 # via jaraco.functools backports.ssl-match-hostname==3.5.0.1 # via websocket-client baron==0.6.2 # via redbaron billiard==3.3.0.23 # via celery -boto==2.43.0 +boto==2.45.0 celery==3.1.17 #certifi==2016.9.26 # via msrest cffi==1.9.1 # via cryptography diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index 8a9e2b786f..2d381c955b 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -3,7 +3,7 @@ apache-libcloud==1.3.0 azure==2.0.0rc6 backports.ssl-match-hostname==3.5.0.1 kombu==3.0.35 -boto==2.43.0 +boto==2.45.0 psphere==0.5.2 psutil==5.0.0 pyvmomi==6.5 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 9421603f5c..59a7fe9544 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -30,7 +30,7 @@ azure-storage==0.33.0 # via azure azure==2.0.0rc6 Babel==2.3.4 # via osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-heatclient, python-magnumclient, python-neutronclient, python-novaclient, python-openstackclient, python-troveclient backports.ssl-match-hostname==3.5.0.1 -boto==2.43.0 +boto==2.45.0 #certifi==2016.9.26 # via msrest cffi==1.9.1 # via cryptography chardet==2.3.0 # via msrest