From 112df7ab42c68eefdaa55bc2ced763aa9070ceb3 Mon Sep 17 00:00:00 2001
From: Stephen Gordon <sgordon@redhat.com>
Date: Fri, 1 Nov 2013 20:37:51 -0400
Subject: [PATCH] Corrected Ceilmeter installation for RHEL/CentOS/Fedora

Set correct package and service names for Ceilometer on RHEL, CentOS,
Fedora and derivative distributions.

Change-Id: I32e8fb4963739c2495b5e94c4eb87d0b8e920b97
backport: havana
---
 doc/install-guide/section_ceilometer-install.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/install-guide/section_ceilometer-install.xml b/doc/install-guide/section_ceilometer-install.xml
index 466d714f48..147638299e 100644
--- a/doc/install-guide/section_ceilometer-install.xml
+++ b/doc/install-guide/section_ceilometer-install.xml
@@ -14,7 +14,7 @@
       <para>Install the Metering Service on the controller
         node:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install ceilometer-api ceilometer-collector ceilometer-agent-central python-ceilometerclient</userinput></screen>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-ceilometer-api openstack-ceilometer-collector openstack-ceilometer-agent-central python-ceilometerclient FIXME</userinput></screen>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-ceilometer-api openstack-ceilometer-collector openstack-ceilometer-central python-ceilometerclient</userinput></screen>
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-ceilometer-api openstack-ceilometer-collector openstack-ceilometer-agent-central python-ceilometerclient</userinput></screen>
     </step>
     <step os="debian"><para>Answer to the <systemitem class="library">debconf</systemitem>
@@ -26,15 +26,19 @@
         Specify the location of the database in the configuration
         file. The examples in this guide use a MongoDB database on the
         controller node.</para>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>FIXME</userinput></screen>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install mongodb-server mongodb</userinput></screen>
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install mongodb</userinput></screen>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install mongodb</userinput></screen>
     </step>
-    <step os="opensuse;sles">
+    <step os="rhel;centos;fedora;opensuse;sles">
       <para>Start the MongoDB server and configure it to start when
         the system boots:</para>
-      <screen><prompt>#</prompt> <userinput>systemctl start mongodb.service</userinput>
+      <screen os="opensuse;sles"><prompt>#</prompt> <userinput>systemctl start mongodb.service</userinput>
 <prompt>#</prompt> <userinput>systemctl enable mongodb.service</userinput></screen>
+      <!-- NB: The use of mongod, and not mongodb, in the below screen is
+           intentional. -->
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>service mongod start</userinput>
+<prompt>#</prompt> <userinput>chkconfig mongod on</userinput></screen>
     </step>
     <step>
       <para>Create the database and a <literal>ceilometer</literal>