From d01cfb23be292a888724043da857d944b20a2517 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sat, 3 May 2014 19:16:59 +0200
Subject: [PATCH] Add hw_vif_model and hw_disk_bus to glance properties

Document hw_vif_model (for both libvirt and VMware) and hw_disk_bus
(libvirt) based on information in nova repository files
nova/virt/libvirt/vif.py and nova/virt/libvirt/vif.py.

Change-Id: Ib22c8192a60b35fb1bb8c755c4d9bff9c72456f7
Closes-Bug: #1314738
---
 .../ch_cli_glance_property_keys.xml           | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/doc/cli-reference/ch_cli_glance_property_keys.xml b/doc/cli-reference/ch_cli_glance_property_keys.xml
index 2aa4b0bfee..93e92340fb 100644
--- a/doc/cli-reference/ch_cli_glance_property_keys.xml
+++ b/doc/cli-reference/ch_cli_glance_property_keys.xml
@@ -221,6 +221,18 @@
                     </itemizedlist>
                 </td>
             </tr>
+            <tr valign="top">
+                <td>libvirt API driver</td>
+                <td>hw_disk_bus</td>
+                <td>Specifies the type of disk controller to attach
+                  disk devices to.</td>
+                <td>
+                  One of <literal>scsi</literal>,
+                  <literal>virtio</literal>, <literal>uml</literal>,
+                  <literal>xen</literal>, <literal>ide</literal>, or
+                  <literal>usb</literal>.
+              </td>
+            </tr>
             <tr valign="top">
                 <td><para>libvirt API driver</para></td>
                 <td><para>hw_rng_model</para></td>
@@ -304,6 +316,45 @@
                     or machine images (aki, ari, or ami).</td>
                 <td/>
             </tr>
+            <tr valign="top">
+                <td>libvirt API driver and VMware API driver</td>
+                <td>hw_vif_model</td>
+                <td>Specifies the model of virtual network interface device to use.</td>
+                <td>
+                  <para>
+                  The valid options depend on the configured
+                  hypervisor.
+                  </para>
+                  <itemizedlist>
+                    <listitem>
+                      <para>KVM and QEMU: <literal>e1000</literal>,
+                      <literal>ne2k_pci</literal>,
+                      <literal>pcnet</literal>,
+                      <literal>rtl8139</literal>, and
+                      <literal>virtio</literal>.
+                      </para>
+                    </listitem>
+                    <listitem>
+                      <para>VMware: <literal>e1000</literal>,
+                      <literal>e1000e</literal>,
+                      <literal>VirtualE1000</literal>,
+                      <literal>VirtualE1000e</literal>,
+                      <literal>VirtualPCNet32</literal>,
+                      <literal>VirtualSriovEthernetCard</literal>, and
+                      <literal>VirtualVmxnet</literal>.
+                      </para>
+                    </listitem>
+                    <listitem>
+                      <para>Xen: <literal>e1000</literal>,
+                      <literal>netfront</literal>,
+                      <literal>ne2k_pci</literal>,
+                      <literal>pcnet</literal>, and
+                      <literal>rtl8139</literal>.
+                      </para>
+                    </listitem>
+                  </itemizedlist>
+              </td>
+            </tr>
             <tr valign="top">
                 <td>VMware API driver</td>
                 <td>vmware_adaptertype</td>