From 6f0db799f9f9853a4485736356288bb4760165a2 Mon Sep 17 00:00:00 2001
From: Stephen Gordon <sgordon@redhat.com>
Date: Fri, 1 Nov 2013 20:18:12 -0400
Subject: [PATCH] Corrections for Ceilometer setup on Compute node

- Correct package and service names for RHEL/CentOS/Fedora.
- Use <systemitem class="service"> instead of <literal> for service names.
- Removed redundant os profiling condition (os was set on both step and
  the screen element within the step).

backport: havana
Change-Id: Ibb75b26c7b943db616c0a0d759e9f9826f5bb2f9
---
 doc/install-guide/section_ceilometer-nova.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/install-guide/section_ceilometer-nova.xml b/doc/install-guide/section_ceilometer-nova.xml
index eca5367adc..4e5530fec3 100644
--- a/doc/install-guide/section_ceilometer-nova.xml
+++ b/doc/install-guide/section_ceilometer-nova.xml
@@ -12,7 +12,7 @@
     <step>
       <para>Install the Metering service on the compute node:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install ceilometer-agent-compute</userinput></screen>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-ceilometer-agent-compute FIXME</userinput></screen>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-ceilometer-compute</userinput></screen>
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-ceilometer-agent-compute</userinput></screen>
     </step>
 
@@ -61,11 +61,17 @@ metering_secret = ADMIN_TOKEN
     </step>
 
 
-    <step os="rhel;fedora;centos;opensuse;sles"><para>Start the <literal>ceilometer-agent-compute</literal> service and configure
+    <step os="opensuse;sles"><para>Start the <systemitem class="service">ceilometer-agent-compute</systemitem> service and configure
       to start when the system boots.</para>
-      <screen os="rhel;fedora;centos;opensuse;sles"><prompt>#</prompt> <userinput>service openstack-ceilometer-agent-compute start</userinput>
+      <screen><prompt>#</prompt> <userinput>service openstack-ceilometer-agent-compute start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-ceilometer-agent-compute on</userinput></screen>
-</step>
+    </step>
+
+    <step os="rhel;fedora;centos;"><para>Start the <systemitem class="service">openstack-ceilometer-compute</systemitem> service and configure
+      to start when the system boots.</para>
+      <screen><prompt>#</prompt> <userinput>service openstack-ceilometer-compute start</userinput>
+<prompt>#</prompt> <userinput>chkconfig openstack-ceilometer-compute on</userinput></screen>
+    </step>
 
   </procedure>
 </section>