Merge "Specify minimal version of Virtuozzo hypervisor"

This commit is contained in:
Jenkins 2016-11-23 13:30:05 +00:00 committed by Gerrit Code Review
commit 3bc0d6fedd
2 changed files with 7 additions and 6 deletions

View File

@ -2,9 +2,9 @@
Virtuozzo Virtuozzo
========= =========
Virtuozzo, or its community edition OpenVZ, provides both types of Virtuozzo 7.0.0 (or newer), or its community edition OpenVZ, provides
virtualization: Kernel Virtual Machines and OS Containers. The type both types of virtualization: Kernel Virtual Machines and OS Containers.
of instance to span is chosen depending on the ``hw_vm_type`` The type of instance to span is chosen depending on the ``hw_vm_type``
property of an image. property of an image.
.. note:: .. note::

View File

@ -59,6 +59,7 @@ The following hypervisors are supported:
use to run Windows, Linux, and FreeBSD virtual machines. use to run Windows, Linux, and FreeBSD virtual machines.
Runs ``nova-compute`` natively on the Windows virtualization platform. Runs ``nova-compute`` natively on the Windows virtualization platform.
* `Virtuozzo <https://virtuozzo.com/products/#product-virtuozzo/>`_ - * `Virtuozzo <https://virtuozzo.com/products/#product-virtuozzo/>`_
OS Containers and Kernel-based Virtual Machines supported via libvirt 7.0.0 and newer - OS Containers and Kernel-based Virtual Machines
virt_type=parallels. The supported formats include ploop and qcow2 images. supported via libvirt virt_type=parallels. The supported formats
include ploop and qcow2 images.