lumarel/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vbox needs box.ovf

Browse Source
This commit is contained in:
Neil Hanlon 2022-11-23 10:43:47 -05:00
parent 5a3ee3f89f
commit 5b620d4314
Signed by untrusted user: neil
GPG Key ID: 705BC21EC3C70F34
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
iso/empanadas/empanadas/scripts/build_image.py
View File

@ -146,7 +146,7 @@ class ImageBuild:
] ]
if self.image_type in ["Vagrant"]: if self.image_type in ["Vagrant"]:
_map = { _map = {
"Vbox": {"format": "vmdk", "provider": "virtualbox", "convertOptions": ["-o", "subformat=streamOptimized"]}, "Vbox": {"format": "vmdk", "provider": "virtualbox"},
"Libvirt": {"format": "qcow2", "provider": "libvirt", "virtual_size": 10}, "Libvirt": {"format": "qcow2", "provider": "libvirt", "virtual_size": 10},
"VMware": {"format": "vmdk", "provider": "vmware_desktop"} "VMware": {"format": "vmdk", "provider": "vmware_desktop"}
} }
@ -179,9 +179,11 @@ class ImageBuild:
templates['info.json'] = tmplenv.get_template('vagrant/info.tmpl.json') templates['info.json'] = tmplenv.get_template('vagrant/info.tmpl.json')
if self.variant == "VMware": if self.variant == "VMware":
provider = "vmware_desktop"
templates[f"{self.outname}.vmx"] = tmplenv.get_template('vagrant/vmx.tmpl') templates[f"{self.outname}.vmx"] = tmplenv.get_template('vagrant/vmx.tmpl')
if self.variant == "Vbox":
templates['box.ovf'] = tmplenv.get_template('vagrant/box.tmpl.ovf')
if self.variant == "Libvirt": if self.variant == "Libvirt":
# Libvirt vagrant driver expects the qcow2 file to be called box.img. # Libvirt vagrant driver expects the qcow2 file to be called box.img.
qemu_command_index = [i for i, d in enumerate(self.stage_commands) if d[0] == "qemu-img"][0] qemu_command_index = [i for i, d in enumerate(self.stage_commands) if d[0] == "qemu-img"][0]