openstack/openstack-manuals
Code Issues Proposed changes

Merge "Add ironic as a valid hypervisor_type"

Browse Source
This commit is contained in:
Jenkins 2015-09-14 23:56:59 +00:00 committed by Gerrit Code Review
commit fd28ac9b81
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -766,9 +766,10 @@ trusty-server-cloudimg-amd64-disk1.vmdk</userinput></screen>
the <option>hypervisor_type</option> tag to match images to the <option>hypervisor_type</option> tag to match images to
the correct hypervisor type. For VMware images, set the the correct hypervisor type. For VMware images, set the
hypervisor type to <literal>vmware</literal>. Other valid hypervisor type to <literal>vmware</literal>. Other valid
hypervisor types include: <literal>xen</literal>, hypervisor types include: <literal>hyperv</literal>,
<literal>qemu</literal>, <literal>lxc</literal>, <literal>ironic</literal>, <literal>lxc</literal>,
<literal>uml</literal>, and <literal>hyperv</literal>. <literal>qemu</literal>, <literal>uml</literal>, and
<literal>xen</literal>.
Note that <literal>qemu</literal> is used for both QEMU and Note that <literal>qemu</literal> is used for both QEMU and
KVM hypervisor types.</para> KVM hypervisor types.</para>
<screen><prompt>$</prompt> <userinput>glance image-create --name "ubuntu-thick-scsi" --disk-format vmdk \ <screen><prompt>$</prompt> <userinput>glance image-create --name "ubuntu-thick-scsi" --disk-format vmdk \