diff --git a/doc/install-guide/section_ceilometer-controller.xml b/doc/install-guide/section_ceilometer-controller.xml
index da25d0fdce..0a689abb3a 100644
--- a/doc/install-guide/section_ceilometer-controller.xml
+++ b/doc/install-guide/section_ceilometer-controller.xml
@@ -255,15 +255,20 @@ connection = mongodb://ceilometer:<replaceable>CEILOMETER_DBPASS</replaceable>@<
             in the connection string in accordance with RFC2396.</para>
         </step>
         <step>
-          <para>In the <literal>[DEFAULT]</literal> section, configure
-            <application>RabbitMQ</application> message broker access:</para>
+          <para>In the <literal>[DEFAULT]</literal> and
+            <literal>[oslo_messaging_rabbit]</literal> sections, configure
+            <application>RabbitMQ</application> message queue access:</para>
           <programlisting language="ini">[DEFAULT]
 ...
 rpc_backend = rabbit
+
+[oslo_messaging_rabbit]
+...
 rabbit_host = <replaceable>controller</replaceable>
+rabbit_userid = openstack
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
-          <para>Replace <replaceable>RABBIT_PASS</replaceable> with the password
-            you chose for the <literal>guest</literal> account in
+          <para>Replace <replaceable>RABBIT_PASS</replaceable> with the
+            password you chose for the <literal>openstack</literal> account in
             <application>RabbitMQ</application>.</para>
         </step>
         <step>
diff --git a/doc/install-guide/section_ceilometer-glance.xml b/doc/install-guide/section_ceilometer-glance.xml
index e510c9585d..1aaaf1d0f0 100644
--- a/doc/install-guide/section_ceilometer-glance.xml
+++ b/doc/install-guide/section_ceilometer-glance.xml
@@ -20,9 +20,10 @@
 notification_driver = messagingv2
 rpc_backend = rabbit
 rabbit_host = <replaceable>controller</replaceable>
+rabbit_userid = openstack
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
       <para>Replace <replaceable>RABBIT_PASS</replaceable> with the
-        password you chose for the <literal>guest</literal> account in
+        password you chose for the <literal>openstack</literal> account in
         <application>RabbitMQ</application>.</para>
     </step>
     <step>
diff --git a/doc/install-guide/section_ceilometer-nova.xml b/doc/install-guide/section_ceilometer-nova.xml
index c41d2e8ba6..f661879bc5 100644
--- a/doc/install-guide/section_ceilometer-nova.xml
+++ b/doc/install-guide/section_ceilometer-nova.xml
@@ -30,14 +30,21 @@ telemetry_secret = <replaceable>TELEMETRY_SECRET</replaceable></programlisting>
           the telemetry secret you chose for the Telemetry module.</para>
         </step>
         <step os="centos;fedora;opensuse;rhel;sles;ubuntu">
-          <para>In the <literal>[DEFAULT]</literal> section, configure
-            <application>RabbitMQ</application> message broker access:</para>
+          <para>In the <literal>[DEFAULT]</literal> and
+            <literal>[oslo_messaging_rabbit]</literal> sections, configure
+            <application>RabbitMQ</application> message queue access:</para>
           <programlisting language="ini">[DEFAULT]
 ...
+rpc_backend = rabbit
+
+[oslo_messaging_rabbit]
+...
 rabbit_host = <replaceable>controller</replaceable>
+rabbit_userid = openstack
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
-          <para>Replace <replaceable>RABBIT_PASS</replaceable> with the password
-          you chose for the guest account in RabbitMQ.</para>
+          <para>Replace <replaceable>RABBIT_PASS</replaceable> with the
+            password you chose for the <literal>openstack</literal> account in
+            <application>RabbitMQ</application>.</para>
         </step>
         <step>
           <para>In the <literal>[keystone_authtoken]</literal> section,
diff --git a/doc/install-guide/section_ceilometer-swift.xml b/doc/install-guide/section_ceilometer-swift.xml
index a3ce1e37b7..20dd6a27ea 100644
--- a/doc/install-guide/section_ceilometer-swift.xml
+++ b/doc/install-guide/section_ceilometer-swift.xml
@@ -69,12 +69,12 @@ pipeline = authtoken cache healthcheck keystoneauth proxy-logging ceilometer pro
 ...
 paste.filter_factory = ceilometermiddleware.swift:filter_factory
 control_exchange = swift
-url = rabbit://guest:<replaceable>RABBIT_PASS</replaceable>@<replaceable>controller></replaceable>:5672/
+url = rabbit://openstack:<replaceable>RABBIT_PASS</replaceable>@<replaceable>controller></replaceable>:5672/
 driver = messagingv2
 topic = notifications
 log_level = WARN</programlisting>
           <para>Replace <replaceable>RABBIT_PASS</replaceable> with the
-            password you chose for the <literal>guest</literal> account in
+            password you chose for the <literal>openstack</literal> account in
             <application>RabbitMQ</application>.</para>
         </step>
       </substeps>