Adds info about control_exchange option for AMPQ (RPC calls)

Fix bug 1083944 Change-Id: I4a0d7d37b9fc8cf48a8e66bcca8bbd5026002ad6
openstack · Dec 7, 2012 · c21bf9d · c21bf9d
1 parent a8d2ff9
commit c21bf9d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/doc/src/docbkx/openstack-compute-admin/computeconfigure.xml b/doc/src/docbkx/openstack-compute-admin/computeconfigure.xml
@@ -1760,7 +1760,7 @@ qpid_protocol=ssl
 
             <td><literal>nova</literal></td>
 
-            <td>String value; Name of the main exchange to connect to</td>
+            <td>String value; Name of the main AMQP exchange to connect to if using RabbitMQ or Qpid for RPC (not Zeromq).</td>
           </tr>
 
           <tr>

diff --git a/doc/src/docbkx/openstack-compute-admin/tables/common-nova-conf.xml b/doc/src/docbkx/openstack-compute-admin/tables/common-nova-conf.xml
@@ -138,8 +138,9 @@
             </tr>
             <tr>
                 <td><para> control_exchange=nova </para></td>
-                <td><para> (StrOpt) the main RabbitMQ exchange to connect to
-                </para></td>
+                <td><para> (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid for RPC (not Zeromq).
+                </para>
+                <note><para>Currently you cannot set different exchange values for volumes and networks, for example.</para></note></td>
             </tr>
             <tr>
                 <td><para> debug=false </para></td>
@@ -152,7 +153,7 @@
             </tr>
             <tr>
                 <td><para>default_ephemeral_format=&lt;None&gt; </para></td>
-                <td><para> (StrOpt) The default format a ephemeral_volume
+                <td><para> (StrOpt) The default format an ephemeral_volume
                     will be formatted with on creation. </para></td>
             </tr>
             <tr>