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

Added missing checks

Browse Source
This commit is contained in:
Dmitry Malinovsky 2013-12-09 17:27:48 +07:00
parent fa1c9c4401
commit daf074c62b
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/runners/virt.py
View File

@ -158,12 +158,13 @@ def init(
if name in data[hyper]['vm_info']:
print('Virtual machine {0} is already deployed'.format(name))
return 'fail'
if hyper:
if hyper not in data:
if hyper is None:
hyper = _determine_hyper(data)
if hyper not in data or not hyper:
print('Hypervisor {0} was not found'.format(hyper))
return 'fail'
else:
hyper = _determine_hyper(data)
if seed:
print('Minion will be preseeded')
@ -183,13 +184,16 @@ def init(
image,
'seed={0}'.format(seed),
'nic={0}'.format(nic),
'install={0}'.format(install)
'install={0}'.format(install),
],
timeout=600)
next(cmd_ret)
print('VM {0} initialized on hypervisor {1}'.format(name, hyper))
ret = next(cmd_ret)
if not ret:
print('VM {0} was not initialized.'.format(name))
return 'fail'
print('VM {0} initialized on hypervisor {1}'.format(name, hyper))
return 'good'