kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-10-08 01:40:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix modification box.ovf in vagrant plugin

Browse source
This commit is contained in:
Anders Ingemann 2015-05-02 12:15:21 +02:00
parent f10fe8efd6
commit df224e61a4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrapvz/plugins/vagrant/assets/box.ovf
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vbox="http://www.virtualbox.org/ovf/machine"> <Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vbox="http://www.virtualbox.org/ovf/machine">
<References> <References>
<File ovf:href="[disk_name]" ovf:id="file1"/> <File ovf:href="[DISK_NAME]" ovf:id="file1"/>
</References> </References>
<DiskSection> <DiskSection>
<Info>List of the virtual disks used in the package</Info> <Info>List of the virtual disks used in the package</Info>

4
bootstrapvz/plugins/vagrant/tasks.py
View file

@ -184,7 +184,7 @@ class PackageBox(Task):
[disk] = root.findall('./ovf:DiskSection/ovf:Disk', namespaces) [disk] = root.findall('./ovf:DiskSection/ovf:Disk', namespaces)
attr(disk, 'ovf:capacity', info.volume.size.bytes.get_qty_in('B')) attr(disk, 'ovf:capacity', info.volume.size.bytes.get_qty_in('B'))
attr(disk, 'ovf:format', info.volume.ovf_uri) attr(disk, 'ovf:format', info.volume.ovf_uri)
attr(disk, 'ovf:uuid', volume_uuid) attr(disk, 'vbox:uuid', volume_uuid)
[system] = root.findall('./ovf:VirtualSystem', namespaces) [system] = root.findall('./ovf:VirtualSystem', namespaces)
attr(system, 'ovf:id', info._vagrant['box_name']) attr(system, 'ovf:id', info._vagrant['box_name'])
@ -205,7 +205,7 @@ class PackageBox(Task):
[device_img] = machine.findall('./ovf:StorageControllers' [device_img] = machine.findall('./ovf:StorageControllers'
'/ovf:StorageController[@name="SATA Controller"]' '/ovf:StorageController[@name="SATA Controller"]'
'/ovf:AttachedDevice/ovf:Image', namespaces) '/ovf:AttachedDevice/ovf:Image', namespaces)
attr(device_img, 'ovf:uuid', '{' + str(volume_uuid) + '}') attr(device_img, 'uuid', '{' + str(volume_uuid) + '}')
template.write(destination, xml_declaration=True) # , default_namespace=namespaces['ovf'] template.write(destination, xml_declaration=True) # , default_namespace=namespaces['ovf']