valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #174 from s0undt3ch/develop

Browse Source 
Test for EC2_AP_SOUTHEAST2 attribute before adding it to the locations dictionary.
This commit is contained in:
Joseph Hall 2012-11-28 19:09:55 -08:00
commit b54d8cdfa7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
saltcloud/clouds/aws.py
View File

@ -76,7 +76,6 @@ def __virtual__():
EC2_LOCATIONS = {
'ap-northeast-1': Provider.EC2_AP_NORTHEAST,
'ap-southeast-1': Provider.EC2_AP_SOUTHEAST,
'ap-southeast-2': Provider.EC2_AP_SOUTHEAST2,
'eu-west-1': Provider.EC2_EU_WEST,
'sa-east-1': Provider.EC2_SA_EAST,
'us-east-1': Provider.EC2_US_EAST,
@ -85,6 +84,9 @@ EC2_LOCATIONS = {
}
DEFAULT_LOCATION = 'us-east-1'
if hasattr(Provider, 'EC2_AP_SOUTHEAST2'):
EC2_LOCATIONS['ap-southeast-2'] = Provider.EC2_AP_SOUTHEAST2
def get_conn(**kwargs):
'''