diff --git a/etc/metadefs/compute-libvirt.json b/etc/metadefs/compute-libvirt.json index 419c40fec2..c6f4559c73 100644 --- a/etc/metadefs/compute-libvirt.json +++ b/etc/metadefs/compute-libvirt.json @@ -54,8 +54,9 @@ }, "hw_video_ram": { "title": "Max Video Ram", - "description": "Maximum RAM for the video image. Used only if a hw_video:ram_max_mb value has been set in the flavor's extra_specs and that value is higher than the value set in hw_video_ram.", - "type": "integer" + "description": "Maximum RAM (unit: MB) for the video image. Used only if a hw_video:ram_max_mb value has been set in the flavor's extra_specs and that value is higher than the value set in hw_video_ram.", + "type": "integer", + "minimum": 0 }, "os_command_line": { "title": "Kernel Command Line", @@ -64,23 +65,17 @@ }, "hw_vif_model": { "title": "Virtual Network Interface", - "description": "Specifies the model of virtual network interface device to use. The valid options depend on the configured hypervisor. KVM and QEMU: e1000, ne2k_pci, pcnet, rtl8139, and virtio. VMware: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32, VirtualSriovEthernetCard, and VirtualVmxnet. Xen: e1000, netfront, ne2k_pci, pcnet, and rtl8139.", + "description": "Specifies the model of virtual network interface device to use. The valid options depend on the hypervisor configuration. libvirt driver options: KVM and QEMU: e1000, ne2k_pci, pcnet, rtl8139, spapr-vlan, and virtio. Xen: e1000, netfront, ne2k_pci, pcnet, and rtl8139.", "type": "string", "enum": [ "e1000", + "e1000e", "ne2k_pci", + "netfront", "pcnet", "rtl8139", - "virtio", - "e1000", - "e1000e", - "VirtualE1000", - "VirtualE1000e", - "VirtualPCNet32", - "VirtualSriovEthernetCard", - "VirtualVmxnet", - "netfront", - "ne2k_pci" + "spapr-vlan", + "virtio" ] }, "hw_qemu_guest_agent": { diff --git a/etc/metadefs/compute-vmware.json b/etc/metadefs/compute-vmware.json index 358a4aa4bf..fefa0a0f3e 100644 --- a/etc/metadefs/compute-vmware.json +++ b/etc/metadefs/compute-vmware.json @@ -18,13 +18,42 @@ "lsiLogic", "busLogic", "ide" - ] + ], + "default" : "lsiLogic" + }, + "vmware_disktype": { + "title": "Disk Provisioning Type", + "description": "When performing operations such as creating a virtual disk, cloning, or migrating, the disk provisioning type may be specified. Please refer to VMware documentation for more.", + "type": "string", + "enum": [ + "thin", + "preallocated", + "thick", + "eagerZeroedThick", + "sparse" + ], + "default" : "preallocated" }, "vmware_ostype": { "title": "OS Type", "description": "A VMware GuestID which describes the operating system installed in the image. This value is passed to the hypervisor when creating a virtual machine. If not specified, the key defaults to otherGuest. See thinkvirt.com.", "type": "string", "default": "otherGuest" + }, + "hw_vif_model": { + "title": "Virtual Network Interface", + "description": "Specifies the model of virtual network interface device to use. The valid options depend on the hypervisor. VMware driver supported options: e1000, e1000e, VirtualE1000, VirtualE1000e, VirtualPCNet32, VirtualSriovEthernetCard, and VirtualVmxnet.", + "type": "string", + "enum": [ + "e1000", + "e1000e", + "VirtualE1000", + "VirtualE1000e", + "VirtualPCNet32", + "VirtualSriovEthernetCard", + "VirtualVmxnet" + ], + "default" : "e1000" } }, "objects": []