diff --git a/doc/config-reference/compute/section_compute-scheduler.xml b/doc/config-reference/compute/section_compute-scheduler.xml index cb96f70505..bd775b00b0 100644 --- a/doc/config-reference/compute/section_compute-scheduler.xml +++ b/doc/config-reference/compute/section_compute-scheduler.xml @@ -478,35 +478,54 @@ aggregate_image_properties_isolation_separator = . instance's image. It passes hosts that can support the specified image properties contained in the instance. Properties include the architecture, hypervisor type, - and virtual machine mode. for example, an instance - might require a host that runs an ARM-based processor - and QEMU as the hypervisor. An image can be decorated + hypervisor version (for Xen hypervisor type only), + and virtual machine mode. + For example, an instance + might require a host that runs an ARM-based processor, + and QEMU as the hypervisor. You can decorate an image with these properties by using: $ glance image-update img-uuid --property architecture=arm --property hypervisor_type=qemu - The image properties that the filter checks for - are: + The image properties that the filter checks for are: architecture: - Architecture describes the machine + describes the machine architecture required by the image. Examples - are i686, x86_64, arm, and ppc64. + are i686, x86_64, + arm, and ppc64. hypervisor_type: - Hypervisor type describes the hypervisor - required by the image. Examples are xen, qemu, - and xenapi. Note that qemu is used for both - QEMU and KVM hypervisor types. + describes the hypervisor required by the image. + Examples are xen, + qemu, and xenapi. + qemu is used for both + QEMU and KVM hypervisor types. - vm_mode: Virtual machine - mode describes the hypervisor application + hypervisor_version_requires: + describes the hypervisor version required by the image. + The property is supported for Xen hypervisor type only. + It can be used to enable support + for multiple hypervisor versions, + and to prevent instances with newer + Xen tools from being provisioned on an older version + of a hypervisor. If available, the property value + is compared to the hypervisor version of the compute host. + To filter the hosts by the hypervisor version, + add the hypervisor_version_requires property + on the image as metadata and pass an operator and a + required hypervisor version as its value: +$ glance image-update img-uuid --property hypervisor_type=xen --property hypervisor_version_requires=">=4.3" + + + vm_mode: describes the hypervisor application binary interface (ABI) required by the image. - Examples are 'xen' for Xen 3.0 paravirtual - ABI, 'hvm' for native ABI, 'uml' for User Mode - Linux paravirtual ABI, exe for container virt - executable ABI. + Examples are xen for Xen 3.0 paravirtual + ABI, hvm for native ABI, + uml for User Mode + Linux paravirtual ABI, exe + for container virt executable ABI.