Install Guide: One message broker to rule them all

Remove Qpid specific setup for Fedora etc, use RabbitMQ everywhere.

Change-Id: I75a45f070c4a5ed3770504b296824d7dc6075c23
Implements: blueprint installation-guide-improvements
backport: none

doc/install-guide/section_basics-queue.xml

@@ -10,9 +10,10 @@
     message brokers including <application>RabbitMQ</application>,
     <application>Qpid</application>, and <application>ZeroMQ</application>.
     However, most distributions that package OpenStack support a particular
-    message broker. This guide covers the message broker supported by each
+    message broker. This guide covers the RabbitMQ message broker which is
-    distribution. If you prefer to implement a different message broker,
+    supported by each distribution. If you prefer to implement a
-    consult the documentation associated with it.</para>
+    different message broker, consult the documentation associated
+    with it.</para>
   <itemizedlist>
     <listitem>
       <para><link xlink:href="http://www.rabbitmq.com">RabbitMQ</link></para>
@@ -25,48 +26,24 @@
     </listitem>
   </itemizedlist>
   <procedure>
-    <title>To install the message broker service</title>
+    <title>To install the <application>RabbitMQ</application> message broker service</title>
     <step os="ubuntu;debian">
-      <para>Ubuntu and Debian use <application>RabbitMQ</application>.</para>
       <screen><prompt>#</prompt> <userinput>apt-get install rabbitmq-server</userinput></screen>
     </step>
     <step os="rhel;centos;fedora">
-      <para>Red Hat Enterprise Linux (RHEL), CentOS, Scientific Linux, and
+      <screen><prompt>#</prompt> <userinput>yum install rabbitmq-server</userinput></screen>
-        Fedora use <application>Qpid</application>.
-      </para>
-      <screen><prompt>#</prompt> <userinput>yum install qpid-cpp-server</userinput></screen>
     </step>
     <step os="sles;opensuse">
-      <para>SUSE Linux Enterprise Server (SLES) and openSUSE use
-        <application>RabbitMQ</application>.</para>
       <screen><prompt>#</prompt> <userinput>zypper install rabbitmq-server</userinput></screen>
     </step>
   </procedure>
   <procedure>
     <title>To configure the message broker service</title>
-    <step os="rhel;centos;fedora">
+    <step os="sles;opensuse;rhel;centos;fedora">
-      <para>To simplify installation of your test environment, we recommend
-        that you disable authentication.</para>
-      <para>Edit the <filename>/etc/qpidd.conf</filename> file and change
-        the following key:</para>
-      <programlisting>auth=no</programlisting>
-      <note>
-        <para>For production environments, you should enable authentication.
-          For more information on securing the message broker, see the
-        <link xlink:href=
-          "http://qpid.apache.org/books/trunk/AMQP-Messaging-Broker-CPP-Book/html/chap-Messaging_User_Guide-Security.html"
-          >documentation</link>.</para>
-        <para>If you decide to enable authentication for your test
-          environment, you must configure the <literal>qpid_username</literal>
-          and <literal>qpid_password</literal> keys in the configuration file
-          of each OpenStack service that uses the message broker.</para>
-      </note>
-    </step>
-    <step os="sles;opensuse">
       <para>Start the message broker service:</para>
       <screen><prompt>#</prompt> <userinput>service rabbitmq-server start</userinput></screen>
     </step>
-    <step os="ubuntu;debian;sles;opensuse">
+    <step>
       <para>The message broker creates a default account that uses
         <literal>guest</literal> for the username and password. To simplify
         installation of your test environment, we recommend that you use this
@@ -94,13 +71,7 @@
   </procedure>
   <procedure os="rhel;centos;fedora;sles;opensuse">
     <title>To finalize installation</title>
-    <step os="rhel;centos;fedora">
+    <step>
-      <para>Start the message broker service and configure it to start when
-        the system boots:</para>
-      <screen><prompt>#</prompt> <userinput>service qpidd start</userinput>
-<prompt>#</prompt> <userinput>chkconfig qpidd on</userinput></screen>
-    </step>
-    <step os="sles;opensuse">
       <para>Configure the message broker service to start when the system
         boots:</para>
       <screen><prompt>#</prompt> <userinput>chkconfig rabbitmq-server on</userinput></screen>

doc/install-guide/section_ceilometer-glance.xml

@@ -18,14 +18,11 @@ rabbit_host = <replaceable>controller</replaceable>
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
 
         <para os="opensuse;sles;fedora;rhel;centos">Run the following commands:</para>
-        <screen os="opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT notification_driver messaging</userinput>
+        <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT notification_driver messaging</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT rpc_backend rabbit</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT rabbit_host <replaceable>controller</replaceable></userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
 
-        <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT notification_driver messaging</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT rpc_backend qpid</userinput></screen>
-
     </step>
     <step>
         <para>Restart the Image Services with their new

doc/install-guide/section_ceilometer-install.xml

@@ -140,21 +140,15 @@ connection = mongodb://ceilometer:<replaceable>CEILOMETER_DBPASS</replaceable>@<
 metering_secret = <replaceable>CEILOMETER_TOKEN</replaceable></programlisting>
     </step>
 
-    <step os="opensuse;sles;ubuntu">
+    <step os="opensuse;sles;ubuntu;rhel;centos;fedora">
       <para>Configure the RabbitMQ access:</para>
-      <screen os="opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf DEFAULT rabbit_host <replaceable>controller</replaceable></userinput>
+      <screen os="opensuse;sles;rhel;centos;fedora"><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf DEFAULT rabbit_host <replaceable>controller</replaceable></userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf DEFAULT rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
       <para os="ubuntu">Edit the <filename>/etc/ceilometer/ceilometer.conf</filename> file and update the <literal>[DEFAULT]</literal> section:</para>
       <programlisting os="ubuntu" language="ini">rabbit_host = <replaceable>controller</replaceable>
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
     </step>
 
-    <step os="rhel;centos;fedora">
-      <para>Configure the Qpid access:</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf \
-  DEFAULT rpc_backend ceilometer.openstack.common.rpc.impl_qpid</userinput></screen>
-    </step>
-
     <step os="opensuse;sles">
         <para>Configure the collector dispatcher:</para>
         <screen os="opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf \

doc/install-guide/section_ceilometer-nova.xml

@@ -70,9 +70,9 @@ notification_driver = ceilometer.compute.nova_notifier</programlisting>
 metering_secret = <replaceable>CEILOMETER_TOKEN</replaceable></programlisting>
     </step>
 
-    <step os="opensuse;sles;ubuntu">
+    <step os="opensuse;sles;ubuntu;rhel;centos;fedora">
       <para>Configure the RabbitMQ access:</para>
-      <screen os="opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf DEFAULT rabbit_host controller</userinput>
+      <screen os="opensuse;sles;rhel;centos;fedora"><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf DEFAULT rabbit_host controller</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf DEFAULT rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
       <para os="ubuntu">Edit the <filename>/etc/ceilometer/ceilometer.conf</filename> file and update the <literal>[DEFAULT]</literal> section:</para>
       <programlisting os="ubuntu" language="ini">[DEFAULT]
@@ -80,11 +80,6 @@ rabbit_host = <replaceable>controller</replaceable>
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
     </step>
 
-    <step os="rhel;centos;fedora">
-      <para>Configure the QPid access:</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf DEFAULT qpid_hostname <replaceable>controller</replaceable></userinput></screen>
-    </step>
-
     <step>
       <para>Add the Identity service credentials:</para>
       <screen os="centos;rhel;fedora;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf \

doc/install-guide/section_cinder-controller.xml

@@ -122,15 +122,7 @@ rabbit_port = 5672
 rabbit_userid = guest
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
     </step>
-    <step os="rhel;centos;fedora">
+    <step os="sles;opensuse;rhel;centos;fedora">
-      <para>Configure Block Storage to use the Qpid message
-        broker:</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf \
-  DEFAULT rpc_backend cinder.openstack.common.rpc.impl_qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf \
-  DEFAULT qpid_hostname controller</userinput></screen>
-    </step>
-    <step os="sles;opensuse">
       <para>Configure Block Storage to use the RabbitMQ message
         broker.</para>
       <para>Replace <replaceable>RABBIT_PASS</replaceable> with the

doc/install-guide/section_cinder-node.xml

@@ -152,15 +152,7 @@ rabbit_port = 5672
 rabbit_userid = guest
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
     </step>
-    <step os="rhel;centos;fedora">
+    <step os="sles;opensuse;rhel;centos;fedora">
-      <para>Configure Block Storage to use the Qpid message
-        broker:</para>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf \
-  DEFAULT rpc_backend cinder.openstack.common.rpc.impl_qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf \
-    DEFAULT qpid_hostname <replaceable>controller</replaceable></userinput></screen>
-    </step>
-    <step os="sles;opensuse">
       <para>Configure Block Storage to use the RabbitMQ message
         broker. Replace <replaceable>RABBIT_PASS</replaceable> with
         the password you chose for RabbitMQ:</para>

doc/install-guide/section_glance-install.xml

@@ -65,14 +65,6 @@
 connection = mysql://glance:GLANCE_DBPASS@<replaceable>controller</replaceable>/glance</programlisting>
     </step>
 
-
-    <step os="fedora;rhel;centos">
-      <para>Configure the Image Service to use the message broker:</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT \
-  rpc_backend qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput></screen>
-    </step>
     <step os="ubuntu">
       <para>Configure the Image Service to use the message broker:</para>
       <substeps>
@@ -91,7 +83,7 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
         </step>
       </substeps>
     </step>
-    <step os="opensuse;sles">
+    <step os="opensuse;sles;rhel;centos;fedora">
       <para>Configure the Image Service to use the message broker:</para>
       <para>Replace <replaceable>RABBIT_PASS</replaceable> with the password
         you chose for the <literal>guest</literal> account in

doc/install-guide/section_neutron-ml2-compute-node.xml

@@ -101,7 +101,7 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
         </step>
       </substeps>
     </step>
-    <step os="opensuse;sles">
+    <step os="opensuse;sles;rhel;centos;fedora">
       <para>Configure Networking to use the message broker:</para>
       <para>Replace <replaceable>RABBIT_PASS</replaceable> with the password
         you chose for the <literal>guest</literal> account in
@@ -114,13 +114,6 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
   rabbit_userid guest</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
   rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
-    </step>
-    <step os="rhel;centos;fedora">
-      <para>Configure Networking to use the message broker:</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  rpc_backend neutron.openstack.common.rpc.impl_qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput></screen>
     </step>
     <step os="ubuntu">
       <para>Configure Networking to use the message broker:</para>

doc/install-guide/section_neutron-ml2-controller-node.xml

@@ -178,7 +178,7 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
         </step>
       </substeps>
     </step>
-    <step os="sles;opensuse">
+    <step os="sles;opensuse;rhel;centos;fedora">
       <para>Configure Networking to use the message broker:</para>
       <para>Replace <replaceable>RABBIT_PASS</replaceable> with the password
         you chose for the <literal>guest</literal> account in
@@ -191,13 +191,6 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
   rabbit_userid guest</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
   rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
-    </step>
-    <step os="rhel;centos;fedora">
-      <para>Configure Networking to use the message broker:</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  rpc_backend neutron.openstack.common.rpc.impl_qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput></screen>
     </step>
     <step os="ubuntu">
       <para>Configure Networking to use the message broker:</para>

doc/install-guide/section_neutron-ml2-network-node.xml

@@ -104,7 +104,7 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
         </step>
       </substeps>
     </step>
-    <step os="sles;opensuse">
+    <step os="sles;opensuse;rhel;centos;fedora">
       <para>Configure Networking to use the message broker:</para>
       <para>Replace <replaceable>RABBIT_PASS</replaceable> with the password
         you chose for the <literal>guest</literal> account in
@@ -117,13 +117,6 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
   rabbit_userid guest</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
   rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
-    </step>
-    <step os="rhel;centos;fedora">
-      <para>Configure Networking to use the message broker:</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  rpc_backend neutron.openstack.common.rpc.impl_qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput></screen>
     </step>
     <step os="ubuntu">
       <para>Configure Networking to use the message broker:</para>

doc/install-guide/section_neutron-ovs-compute-node.xml

@@ -186,7 +186,7 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
           </step>
         </substeps>
       </step>
-      <step os="opensuse;sles">
+      <step os="opensuse;sles;rhel;centos;fedora">
         <para>Configure access to the <application>RabbitMQ</application> service:</para>
         <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
   rpc_backend neutron.openstack.common.rpc.impl_kombu</userinput>
@@ -206,19 +206,6 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
 rabbit_userid = guest
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
       </step>
-      <step os="rhel;centos;fedora">
-        <para>Configure access to the <application>Qpid</application> message queue:</para>
-        <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  rpc_backend neutron.openstack.common.rpc.impl_qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_port 5672</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_username <replaceable>guest</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_password <replaceable>guest</replaceable></userinput></screen>
-      </step>
     </procedure>
     <procedure>
       <title>Configure Compute services for Networking</title>

doc/install-guide/section_neutron-ovs-controller-node.xml

@@ -140,7 +140,7 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
           </step>
         </substeps>
       </step>
-      <step os="opensuse;sles">
+      <step os="opensuse;sles;rhel;centos;fedora">
         <para>Configure access to the <application>RabbitMQ</application>
           service:</para>
         <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
@@ -151,20 +151,6 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
   rabbit_userid guest</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
   rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
-      </step>
-      <step os="rhel;centos;fedora">
-        <para>Configure access to the <application>Qpid</application> message
-          queue:</para>
-        <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  rpc_backend neutron.openstack.common.rpc.impl_qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_port 5672</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_username <replaceable>guest</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_password <replaceable>guest</replaceable></userinput></screen>
       </step>
       <step os="ubuntu;debian">
         <para>Configure Networking to use your message broker. Edit the

doc/install-guide/section_neutron-ovs-network-node.xml

@@ -137,7 +137,7 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
           </step>
         </substeps>
       </step>
-      <step os="opensuse;sles">
+      <step os="opensuse;sles;rhel;centos;fedora">
         <para>Configure access to the <application>RabbitMQ</application> service:</para>
         <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
   rpc_backend neutron.openstack.common.rpc.impl_kombu</userinput>
@@ -157,19 +157,6 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
 rabbit_userid = guest
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
       </step>
-      <step os="rhel;centos;fedora">
-        <para>Configure access to the <application>Qpid</application> message queue:</para>
-        <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  rpc_backend neutron.openstack.common.rpc.impl_qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_port 5672</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_username <replaceable>guest</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
-  qpid_password <replaceable>guest</replaceable></userinput></screen>
-      </step>
     </procedure>
     <procedure>
       <title>Install and configure the Open vSwitch (OVS) plug-in</title>

doc/install-guide/section_nova-compute.xml

@@ -95,11 +95,6 @@ admin_user = nova
 admin_password = <replaceable>NOVA_PASS</replaceable></programlisting>
     </step>
     <step os="fedora;rhel;centos;ubuntu;opensuse;sles">
-      <para os="fedora;rhel;centos">Configure the Compute service to use the
-        Qpid message broker by setting these configuration keys:</para>
-      <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \
-  DEFAULT rpc_backend qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT qpid_hostname <replaceable>controller</replaceable></userinput></screen>
       <para os="ubuntu">Configure the Compute service to use
         the RabbitMQ message broker by setting these configuration
         keys in the <literal>[DEFAULT]</literal> configuration group of
@@ -109,9 +104,9 @@ admin_password = <replaceable>NOVA_PASS</replaceable></programlisting>
 rpc_backend = rabbit
 rabbit_host = controller
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
-      <para os="opensuse;sles">Configure the Compute service to use the RabbitMQ message broker
+      <para os="opensuse;sles;rhel;centos;fedora">Configure the Compute service to use the RabbitMQ message broker
         by setting these configuration keys:</para>
-      <screen os="opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \
+      <screen os="opensuse;sles;fedora;rhel;centos"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \
   DEFAULT rpc_backend nova.rpc.impl_kombu</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT rabbit_host controller</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>

doc/install-guide/section_nova-controller.xml

@@ -51,13 +51,6 @@
 connection = mysql://nova:<replaceable>NOVA_DBPASS</replaceable>@controller/nova</programlisting>
     </step>
 
-    <step os="fedora;rhel;centos">
-      <para>Set these configuration keys to configure Compute to use
-        the Qpid message broker:</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \
-  DEFAULT rpc_backend qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT qpid_hostname <replaceable>controller</replaceable></userinput></screen>
-    </step>
     <step os="ubuntu">
       <para>Configure the Compute service to use the RabbitMQ message broker by
         setting these configuration keys in the <literal>[DEFAULT]</literal>
@@ -69,7 +62,7 @@ rpc_backend = rabbit
 rabbit_host = controller
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
     </step>
-    <step os="opensuse;sles">
+    <step os="opensuse;sles;rhel;centos;fedora">
       <para>Set these configuration keys to configure Compute to use
         the RabbitMQ message broker:</para>
       <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \

doc/install-guide/section_trove-install.xml

@@ -79,23 +79,6 @@ sql_connection = mysql://trove:<literal>TROVE_DBPASS</literal>@<replaceable>cont
 notifier_queue_hostname = <replaceable>controller</replaceable></programlisting>
         </step>
 
-        <step os="fedora;rhel;centos">
-          <para>Set these configuration keys to configure the Database
-          module to use the Qpid message broker:</para>
-          <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-api.conf \
-  DEFAULT rpc_backend qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-taskmaster.conf \
-  DEFAULT rpc_backend qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf \
-  DEFAULT rpc_backend qpid</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-api.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-conductor.conf DEFAULT \
-  qpid_hostname <replaceable>controller</replaceable></userinput></screen>
-        </step>
-
         <step os="ubuntu">
           <para>Configure the Database module to use the RabbitMQ message broker by
           setting the rabbit_password in the <literal>[DEFAULT]</literal>
@@ -106,7 +89,7 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable>
 ...</programlisting>
         </step>
 
-        <step os="opensuse;sles">
+        <step os="opensuse;sles;rhel;centos;fedora">
           <para>Set these configuration keys to configure the Database module to use
           the RabbitMQ message broker:</para>
           <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/trove/trove-api.conf \
@@ -217,17 +200,11 @@ nova_proxy_admin_tenant_name = service
       <substeps>
         <step>
           <para>Add the following lines to <filename>trove-guestagent.conf</filename>:</para>
-          <programlisting language="ini" os="ubuntu;debian;sles;opensuse">rabbit_host = <replaceable>controller</replaceable>
+          <programlisting language="ini">rabbit_host = <replaceable>controller</replaceable>
 rabbit_password = <replaceable>RABBIT_PASS</replaceable>
 nova_proxy_admin_user = admin
 nova_proxy_admin_pass = <replaceable>ADMIN_PASS</replaceable>
 nova_proxy_admin_tenant_name = service
-trove_auth_url = http://<replaceable>controller</replaceable>:35357/v2.0</programlisting>
-          <programlisting language="ini" os="centos;rhel;fedora">rpc_backend = qpid
-qpid_host = <replaceable>controller</replaceable>
-nova_proxy_admin_user = admin
-nova_proxy_admin_pass = <replaceable>ADMIN_PASS</replaceable>
-nova_proxy_admin_tenant_name = service
 trove_auth_url = http://<replaceable>controller</replaceable>:35357/v2.0</programlisting>
         </step>
       </substeps>