From 54a79d7b5292c179837542e5cb570ac3ab529b9e Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Thu, 16 Jan 2014 22:20:40 +0100
Subject: [PATCH] Fix glance configuration for ceilometer

Modify /etc/glance/glance-api.conf, not /etc/ceilometer/ceilometer.conf.

Change-Id: I3725a6578fcad6c49b2fc1cd9495d391157e714b
Closes-Bug: #1269657
backport: havana
---
 doc/install-guide/section_ceilometer-glance.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/install-guide/section_ceilometer-glance.xml b/doc/install-guide/section_ceilometer-glance.xml
index f8e2b8de73..cd3b19005c 100644
--- a/doc/install-guide/section_ceilometer-glance.xml
+++ b/doc/install-guide/section_ceilometer-glance.xml
@@ -13,15 +13,15 @@
         <filename>/etc/glance/glance-api.conf</filename> and modify the
         <literal>[DEFAULT]</literal> section:</para>
         <programlisting language="ini" os="debian;ubuntu">notifier_strategy = rabbit
-rabbit_host = controller
+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/ceilometer/ceilometer.conf DEFAULT notifier_strategy rabbit</userinput>
-<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>
+        <screen os="opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT notifier_strategy 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/ceilometer/ceilometer.conf DEFAULT notifier_strategy qpid</userinput></screen>
+        <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf DEFAULT notifier_strategy qpid</userinput></screen>
 
     </step>
     <step>