From cac2fc67ec7543507a2c010626b3047efb99be52 Mon Sep 17 00:00:00 2001 From: Maxim Nestratov Date: Mon, 11 Jul 2016 22:38:51 +0300 Subject: [PATCH] Expand hypervisor_type meta data with Virtuozzo hypervisor Virtuozzo hypervisor reports itself as 'vz' hypervisor, and it was supported as libvirt virt type since Kilo. Let's expand image metadata so that it will possible to filter out compute nodes, which don't support images requiring hypervisor_type=vz Lite-Spec-Id: I6ba0fcf670aecddde95cfdc6850cdb751dec2058 Change-Id: I51afacf83655107a6c4e4c226623fa360bdafca2 --- etc/metadefs/compute-hypervisor.json | 3 ++- .../notes/virtuozzo-hypervisor-fada477b64ae829d.yaml | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/virtuozzo-hypervisor-fada477b64ae829d.yaml diff --git a/etc/metadefs/compute-hypervisor.json b/etc/metadefs/compute-hypervisor.json index d82531bdbb..29169dc961 100644 --- a/etc/metadefs/compute-hypervisor.json +++ b/etc/metadefs/compute-hypervisor.json @@ -12,7 +12,7 @@ "properties": { "hypervisor_type": { "title": "Hypervisor Type", - "description": "Hypervisor type required by the image. Used with the ImagePropertiesFilter. \n\n KVM - Kernel-based Virtual Machine. LXC - Linux Containers (through libvirt). QEMU - Quick EMUlator. UML - User Mode Linux. hyperv - Microsoft® hyperv. vmware - VMware® vsphere. Baremetal - physical provisioning. For more information, see: http://docs.openstack.org/trunk/config-reference/content/section_compute-hypervisors.html", + "description": "Hypervisor type required by the image. Used with the ImagePropertiesFilter. \n\n KVM - Kernel-based Virtual Machine. LXC - Linux Containers (through libvirt). QEMU - Quick EMUlator. UML - User Mode Linux. hyperv - Microsoft® hyperv. vmware - VMware® vsphere. Baremetal - physical provisioning. VZ - Virtuozzo OS Containers and Virtual Machines (through libvirt). For more information, see: http://docs.openstack.org/trunk/config-reference/content/section_compute-hypervisors.html", "type": "string", "enum": [ "baremetal", @@ -22,6 +22,7 @@ "qemu", "uml", "vmware", + "vz", "xen" ] }, diff --git a/releasenotes/notes/virtuozzo-hypervisor-fada477b64ae829d.yaml b/releasenotes/notes/virtuozzo-hypervisor-fada477b64ae829d.yaml new file mode 100644 index 0000000000..2f6ea47fba --- /dev/null +++ b/releasenotes/notes/virtuozzo-hypervisor-fada477b64ae829d.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The metadata definition for ``hypervisor_type`` in the + ``OS::Compute::Hypervisor`` namespace has been extended to include + the Virtuozzo hypervisor, designated as ``vz``. You may upgrade + the definition using: + + ``glance-manage db load_metadefs [--path ] [--merge] [--prefer_new]``