From 7ee47f21be5e0e7c8b18a1cac32f30470ef353e8 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Mon, 20 Apr 2015 17:20:51 +0200
Subject: [PATCH] [install-guide] fix messaging configuration for Ceilometer

* use oslo_messaging_rabbit for Ceilometer configuration
* use RabbitMQ user openstack

Partially implements bp installguide-kilo.

Change-Id: I5ce02ebd1f679e13e62655a0728aed943cbe0adc
---
 .../section_ceilometer-controller.xml             | 13 +++++++++----
 doc/install-guide/section_ceilometer-glance.xml   |  3 ++-
 doc/install-guide/section_ceilometer-nova.xml     | 15 +++++++++++----
 doc/install-guide/section_ceilometer-swift.xml    |  4 ++--
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/doc/install-guide/section_ceilometer-controller.xml b/doc/install-guide/section_ceilometer-controller.xml
index 132c644d38..a9353cd0e6 100644
--- a/doc/install-guide/section_ceilometer-controller.xml
+++ b/doc/install-guide/section_ceilometer-controller.xml
@@ -218,15 +218,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 a749fc4f5d..936ee41106 100644
--- a/doc/install-guide/section_ceilometer-swift.xml
+++ b/doc/install-guide/section_ceilometer-swift.xml
@@ -64,12 +64,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>