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

Rev boto and add ap-northeast-2 to ec2 regions

Browse Source
This commit is contained in:
Matthew Jones
2016-06-01 14:22:08 -04:00
parent 860d0eea20
commit 79cbd68a13
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/settings/defaults.py
View File

@@ -540,6 +540,7 @@ EC2_REGION_NAMES = {
'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)',
'ap-northeast-2': 'Asia Pacific (Seoul)',
'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.39.0 boto==2.40.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.0rc2 azure==2.0.0rc2
Babel==2.2.0 Babel==2.2.0
boto==2.34.0 boto==2.40.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