From 59a201bdf276d751f41066373db125bd46f3c400 Mon Sep 17 00:00:00 2001
From: Robb Romans <robb.romans@rackspace.com>
Date: Wed, 17 Sep 2014 13:31:07 -0500
Subject: [PATCH] Remove kvm as a hypervisor_type argument

QEMU is used whether specifying either qemu or kvm as an argument to
hypervisor_type. Therefore, remove kvm as a supported argument.

Change-Id: I89f2b907fa868e50c2b65c2bf4a8e414242dd9fc
Closes-bug: #1195361
---
 doc/cli-reference/ch_cli_glance_property_keys.xml    | 11 +++++++----
 .../compute/section_compute-scheduler.xml            |  5 +++--
 .../compute/section_hypervisor_vmware.xml            | 12 ++++++++----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/doc/cli-reference/ch_cli_glance_property_keys.xml b/doc/cli-reference/ch_cli_glance_property_keys.xml
index 9441747b95..770d81ccda 100644
--- a/doc/cli-reference/ch_cli_glance_property_keys.xml
+++ b/doc/cli-reference/ch_cli_glance_property_keys.xml
@@ -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>
diff --git a/doc/config-reference/compute/section_compute-scheduler.xml b/doc/config-reference/compute/section_compute-scheduler.xml
index 9e0cae9887..d630798870 100644
--- a/doc/config-reference/compute/section_compute-scheduler.xml
+++ b/doc/config-reference/compute/section_compute-scheduler.xml
@@ -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
diff --git a/doc/config-reference/compute/section_hypervisor_vmware.xml b/doc/config-reference/compute/section_hypervisor_vmware.xml
index dad0ab04c1..b5511cff65 100644
--- a/doc/config-reference/compute/section_hypervisor_vmware.xml
+++ b/doc/config-reference/compute/section_hypervisor_vmware.xml
@@ -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" \