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

Cleaning up invalid corrections

Browse Source
This commit is contained in:
Daniel Wallace 2014-03-10 02:27:43 -05:00
parent 5f28c0c83e
commit 4a9ce0cdae
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/cloud/__init__.py
View File

@ -567,8 +567,10 @@ class Cloud(object):
# because amazon returns all instances in a region, not
# avaliabilty zone.
if profile:
if alias not in
self.opts['profiles'][profile]['provider'].split(':')[0]:
if alias not in \
self.opts['profiles'][profile]['provider'].split(
':'
)[0]:
continue
for vm_name, details in vms.iteritems():
@ -1445,11 +1447,11 @@ class Map(Cloud):
for alias, drivers in query_map.iteritems():
for driver, vms in drivers.iteritems():
for vm_name, vm_details in vms.iteritems():
if (vm_details != 'Absent') and
(
vm_details['state'].lower() in
matching_states[action]
):
if (vm_details != 'Absent') and \
(
vm_details['state'].lower() in
matching_states[action]
):
vm_names.append(vm_name)
return vm_names