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

Merge pull request #6936 from kaptk2/develop

Browse Source 
Added ability to specify boot order
This commit is contained in:
Thomas S Hatch 2013-08-28 09:41:28 -07:00
commit 0a8ce6a7ad
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/virt.py
View File

@ -197,7 +197,7 @@ def _gen_xml(name,
<memory unit='KiB'>%%MEM%%</memory>
<os>
<type>hvm</type>
<boot dev='hd'/>
%%BOOT%%
</os>
<devices>
<disk type='file' device='disk'>
@ -219,6 +219,16 @@ def _gen_xml(name,
data = data.replace('%%MEM%%', str(mem))
data = data.replace('%%VDA%%', vda)
data = data.replace('%%DISKTYPE%%', _image_type(vda))
boot_str = ''
if 'boot_dev' in kwargs:
for dev in boot_dev:
boot_part = '''<boot dev='%%DEV%%' />
'''
boot_part = boot_part.replace('%%DEV%%', dev)
boot_str += boot_part
else:
boot_str = '''<boot dev='hd'/>'''
data = data.replace('%%BOOT%%', boot_str)
nic_str = ''
for dev, args in nicp.items():
nic_t = '''