External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 13:39:27 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update boto to 2.45.0, add eu-west-2 and ca-central-1

Browse Source
This commit is contained in:
Bill Nottingham
2016-12-20 16:24:57 -05:00
parent f2c2de6b81
commit acaa8a75b2
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/settings/defaults.py
View File

@@ -626,8 +626,10 @@ EC2_REGION_NAMES = {
'us-east-2': _('US East (Ohio)'), '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)'),
'ca-central-1': _('Canada (Central)'),
'eu-central-1': _('EU (Frankfurt)'), 'eu-central-1': _('EU (Frankfurt)'),
'eu-west-1': _('EU (Ireland)'), 'eu-west-1': _('EU (Ireland)'),
'eu-west-2': _('EU (London)'),
'ap-southeast-1': _('Asia Pacific (Singapore)'), 'ap-southeast-1': _('Asia Pacific (Singapore)'),
'ap-southeast-2': _('Asia Pacific (Sydney)'), 'ap-southeast-2': _('Asia Pacific (Sydney)'),
'ap-northeast-1': _('Asia Pacific (Tokyo)'), 'ap-northeast-1': _('Asia Pacific (Tokyo)'),

2
requirements/requirements.in
View File

@@ -7,7 +7,7 @@ apache-libcloud==1.3.0
asgi-amqp==0.3.1 asgi-amqp==0.3.1
azure==2.0.0rc6 azure==2.0.0rc6
backports.ssl-match-hostname==3.5.0.1 backports.ssl-match-hostname==3.5.0.1
boto==2.43.0 boto==2.45.0
channels==0.17.3 channels==0.17.3
celery==3.1.17 celery==3.1.17
Django==1.8.16 Django==1.8.16

2
requirements/requirements.txt
View File

@@ -41,7 +41,7 @@ backports.functools-lru-cache==1.3 # via jaraco.functools
backports.ssl-match-hostname==3.5.0.1 # via websocket-client backports.ssl-match-hostname==3.5.0.1 # via websocket-client
baron==0.6.2 # via redbaron baron==0.6.2 # via redbaron
billiard==3.3.0.23 # via celery billiard==3.3.0.23 # via celery
boto==2.43.0 boto==2.45.0
celery==3.1.17 celery==3.1.17
#certifi==2016.9.26 # via msrest #certifi==2016.9.26 # via msrest
cffi==1.9.1 # via cryptography cffi==1.9.1 # via cryptography

2
requirements/requirements_ansible.in
View File

@@ -3,7 +3,7 @@ apache-libcloud==1.3.0
azure==2.0.0rc6 azure==2.0.0rc6
backports.ssl-match-hostname==3.5.0.1 backports.ssl-match-hostname==3.5.0.1
kombu==3.0.35 kombu==3.0.35
boto==2.43.0 boto==2.45.0
psphere==0.5.2 psphere==0.5.2
psutil==5.0.0 psutil==5.0.0
pyvmomi==6.5 pyvmomi==6.5

2
requirements/requirements_ansible.txt
View File

@@ -30,7 +30,7 @@ azure-storage==0.33.0 # via azure
azure==2.0.0rc6 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 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 backports.ssl-match-hostname==3.5.0.1
boto==2.43.0 boto==2.45.0
#certifi==2016.9.26 # via msrest #certifi==2016.9.26 # via msrest
cffi==1.9.1 # via cryptography cffi==1.9.1 # via cryptography
chardet==2.3.0 # via msrest chardet==2.3.0 # via msrest