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

Merge pull request #26044 from rallytime/fix-25616

Browse Source 
Make sure the key we're comparing is also lowercase
This commit is contained in:
Thomas S Hatch 2015-08-05 13:23:54 -06:00
commit dedcadc37e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/cloud/clouds/linode.py
View File

@ -515,17 +515,16 @@ if HAS_LINODEPY:
# No, let's try to match it against the full
# name and the abbreviation and return the id
for key in locations:
if str(loc).lower() in (key,
if str(loc).lower() in (str(key).lower(),
str(locations[key]['id']).lower(),
str(locations[key]['abbreviation']).
lower()):
str(locations[key]['abbreviation']).lower()):
return locations[key]['id']
else:
return loc
# No match. Return None, cloud provider will
# use a default or throw an exception
return None
# No match. Return default Linode data center location, which is Dallas
# Dallas is represented by '2' in the Linode API.
return 2
def get_disk_size(vm_, size, swap):
'''