From d49261710331a02bc8d0b87677df1af505045f0c Mon Sep 17 00:00:00 2001
From: asettle <alexandra.settle@rackspace.com>
Date: Tue, 26 May 2015 12:18:19 +1000
Subject: [PATCH] Adding rabbit_userid to the heat.conf file

Change-Id: I77c9ed37c53124a870bb289f00a184ae7d376cb5
Closes-bug: #1458440
---
 doc/install-guide/section_heat-install.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/install-guide/section_heat-install.xml b/doc/install-guide/section_heat-install.xml
index 435ad03260..cc993e6244 100644
--- a/doc/install-guide/section_heat-install.xml
+++ b/doc/install-guide/section_heat-install.xml
@@ -212,15 +212,20 @@ connection = mysql://heat:<replaceable>HEAT_DBPASS</replaceable>@<replaceable>co
             password you chose for the Orchestration database.</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
+            password you chose for the <literal>openstack</literal> account in
             <application>RabbitMQ</application>.</para>
         </step>
         <step>