saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge #23151 with pylint fixes

Browse source
This commit is contained in:
rallytime 2015-05-01 19:38:11 -07:00
parent 8ffa12e82d
commit 8ff852a23a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/virt.py
View file

@ -583,7 +583,7 @@ def init(name,
except (IOError, OSError) as e:
raise CommandExecutionError('problem copying image. {0} - {1}'.format(image, e))
seedable = True
else:
log.error('unsupported hypervisor when handling disk image')

6
salt/runners/virt.py
View file

@ -237,9 +237,9 @@ def init(
print('VM {0} was not initialized.'.format(name))
return 'fail'
for minion_id in ret:
if ret[minion_id]['ret'] != True:
print('VM {0} initialization failed. Returned error: {1}'.format(name, ret[minion_id]['ret']))
return 'fail'
if ret[minion_id]['ret'] is False:
print('VM {0} initialization failed. Returned error: {1}'.format(name, ret[minion_id]['ret']))
return 'fail'
print('VM {0} initialized on hypervisor {1}'.format(name, hyper))
return 'good'