openstack/openstack-manuals
Code Issues Proposed changes

Merge "Remove kvm as a hypervisor_type argument"

Browse Source
This commit is contained in:
Jenkins 2014-09-19 08:24:59 +00:00 committed by Gerrit Code Review
commit aa3995e44c
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/cli-reference/ch_cli_glance_property_keys.xml
View File

@ -115,10 +115,13 @@
<tr valign="top">
<td>All</td>
<td>hypervisor_type</td>
<td>The hypervisor type.</td>
<td><literal>xen</literal>, <literal>qemu</literal>, <literal>kvm</literal>,
<literal>lxc</literal>, <literal>uml</literal>, <literal>vmware</literal>,
or <literal>hyperv</literal></td>
<td>The hypervisor type. Note that
<literal>qemu</literal> is used for both QEMU and KVM
hypervisor types.</td>
<td><literal>xen</literal>, <literal>qemu</literal>,
<literal>lxc</literal>, <literal>uml</literal>,
<literal>vmware</literal>, or
<literal>hyperv</literal></td>
</tr>
<tr valign="top">
<td>All</td>

5
doc/config-reference/compute/section_compute-scheduler.xml
View File

@ -473,8 +473,9 @@ aggregate_image_properties_isolation_separator = .</programlisting>
<listitem>
<para><literal>hypervisor_type</literal>:
Hypervisor type describes the hypervisor
required by the image. Examples are xen, kvm,
qemu, and xenapi.</para>
required by the image. Examples are xen, qemu,
and xenapi. Note that qemu is used for both
QEMU and KVM hypervisor types.</para>
</listitem>
<listitem>
<para><literal>vm_mode</literal>: Virtual machine

12
doc/config-reference/compute/section_hypervisor_vmware.xml
View File

@ -747,10 +747,14 @@ trusty-server-cloudimg-amd64-disk1.vmdk</userinput></screen>
<section xml:id="VMware_tagging_images">
<title>Tag VMware images</title>
<para>In a mixed hypervisor environment, OpenStack Compute uses
the <option>hypervisor_type</option> tag to match images to the
correct hypervisor type. For VMware images, set the hypervisor
type to <literal>vmware</literal>. Other valid hypervisor
types include: xen, qemu, kvm, lxc, uml, and hyperv.</para>
the <option>hypervisor_type</option> tag to match images to
the correct hypervisor type. For VMware images, set the
hypervisor type to <literal>vmware</literal>. Other valid
hypervisor types include: <literal>xen</literal>,
<literal>qemu</literal>, <literal>lxc</literal>,
<literal>uml</literal>, and <literal>hyperv</literal>.
Note that <literal>qemu</literal> is used for both QEMU and
KVM hypervisor types.</para>
<screen><prompt>$</prompt> <userinput>glance image-create --name "ubuntu-thick-scsi" --disk-format vmdk \
--container-format bare \
--property vmware_adaptertype="lsiLogic" \