From 0643f7fb25ef2bf4584bd2b35f81074e504ae3ae Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@openstack.org>
Date: Sat, 19 Oct 2013 18:45:51 +1100
Subject: [PATCH] Fixes for Centos install guide

This patch fixes several areas in the install guide
by running through and using them for Centos.

Closes-Bug: 1241331

Change-Id: I247639f5f6aa82cc619ae7dfb0513f596f08c1a3
---
 doc/install-guide/ch_basics.xml               |  3 ++-
 .../section_dashboard-install.xml             | 27 ++++++++++++++++---
 doc/install-guide/section_nova-compute.xml    |  7 ++++-
 doc/install-guide/section_nova-network.xml    |  1 -
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/doc/install-guide/ch_basics.xml b/doc/install-guide/ch_basics.xml
index 24af9ee93a6..4242f3a58fc 100644
--- a/doc/install-guide/ch_basics.xml
+++ b/doc/install-guide/ch_basics.xml
@@ -37,6 +37,7 @@
       node can reach the other nodes on the internal network using
       host names like <literal>controller</literal> and
         <literal>compute1</literal>.</para>
+    <!-- these fedora only paragraphs are confirmed not needed in centos -->
     <para os="fedora">Start by disabling the <literal>NetworkManager</literal> service and
       enabling the <literal>network</literal> service. The
         <literal>network</literal> service is more suitable for the static
@@ -293,7 +294,7 @@ hwclock -w</programlisting>
         <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install python-mysqldb</userinput></screen>
         <screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>yum install mysql MySQL-python</userinput></screen>
         <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install mariadb-client python-mysql</userinput></screen>
-        <para>For SUSE Linux Enterprise, install MySQL:</para>
+        <para os="opensuse;sles">For SUSE Linux Enterprise, install MySQL:</para>
         <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install mysql-client python-mysql</userinput></screen>
       </listitem>
     </itemizedlist>
diff --git a/doc/install-guide/section_dashboard-install.xml b/doc/install-guide/section_dashboard-install.xml
index c41fcb0c702..3907ff35be6 100644
--- a/doc/install-guide/section_dashboard-install.xml
+++ b/doc/install-guide/section_dashboard-install.xml
@@ -103,6 +103,20 @@
             </note>
         </step>
         <step>
+        <para>Update the <literal>ALLOWED_HOSTS</literal>in
+       <filename>local_settings.py</filename> to include the addresses you wish to
+       access the dashboard from.</para>
+      <para>Edit <filename
+                                os="centos;fedora;rhel"
+                                >/etc/openstack-dashboard/local_settings</filename><filename
+                                os="ubuntu;debian"
+                                >/etc/openstack-dashboard/local_settings.py</filename><filename
+                                os="opensuse;sles"
+                                >/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py</filename></para>
+            <programlisting language="python" linenumbering="unnumbered"><?db-font-size 75%?>ALLOWED_HOSTS = ['localhost', 'my-desktop']
+    </programlisting>
+        </step>
+        <step>
         <para>This guide assumes that you are running the Dashboard on the controller node.
         You can easily run the dashboard on a separate server, by changing the appropriate settings in
        <filename>local_settings.py</filename></para>
@@ -134,18 +148,25 @@
           linkend="dashboard-session-database"/>.
           </para>
         </step>
-        <step os="opensuse;sles">
+        <step os="opensuse;sles;fedora;centos;rhel">
           <para>
             Start the Apache web server and memcached:
           </para>
-          <screen><prompt>#</prompt> <userinput>service apache2 start</userinput>
+          <screen os="opensuse;sles"><prompt>#</prompt> <userinput>service apache2 start</userinput>
 <prompt>#</prompt> <userinput>service memcached start</userinput>
 <prompt>#</prompt> <userinput>chckconfig apache2 on</userinput>
 <prompt>#</prompt> <userinput>chckconfig memcached on</userinput></screen>
+          <screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>service httpd start</userinput>
+<prompt>#</prompt> <userinput>service memcached start</userinput>
+<prompt>#</prompt> <userinput>chckconfig httpd on</userinput>
+<prompt>#</prompt> <userinput>chckconfig memcached on</userinput></screen>
+          <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service apache2 restart</userinput>
+<prompt>#</prompt> <userinput>service memcached restart</userinput></screen>
         </step>
         <step>
           <para>You can now access the dashboard at
-          <uri os="centos;fedora;rhel;debian;ubuntu">http://controller/horizon</uri>
+          <uri os="debian;ubuntu">http://controller/horizon</uri>
+          <uri os="centos;fedora;rhel">http://controller/dashboard</uri>
           <uri os="opensuse;sles">http://controller</uri>.</para>
           <para>Login with credentials for any user that you created
           with the OpenStack Identity Service.</para>
diff --git a/doc/install-guide/section_nova-compute.xml b/doc/install-guide/section_nova-compute.xml
index 4f17edc5ae7..bd6840c858f 100644
--- a/doc/install-guide/section_nova-compute.xml
+++ b/doc/install-guide/section_nova-compute.xml
@@ -23,7 +23,7 @@
         <listitem>
           <para>Use different IP addresses when configuring
               <filename>eth0</filename>. This guide uses
-              <literal>192.168.0.11</literal> for the internal network. 
+              <literal>192.168.0.11</literal> for the internal network.
             Do not configure <literal>eth1</literal> with a static IP address.
             An IP address will be assigned and configured by the networking component of OpenStack.</para>
         </listitem>
@@ -142,6 +142,11 @@ admin_password=<replaceable>NOVA_DBPASS</replaceable>
     <para os="fedora;rhel;centos;opensuse;sles">Start the Compute service and configure it to start when the system boots.</para>
     <para os="ubuntu;debian">Restart the Compute service.</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service nova-compute restart</userinput></screen>
+      <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>service libvirtd start</userinput>
+<prompt>#</prompt> <userinput>service messagebus start</userinput>
+<prompt>#</prompt> <userinput>chkconfig libvirtd on</userinput>
+<prompt>#</prompt> <userinput>chkconfig messagebus on</userinput>
+</screen>
       <screen os="centos;rhel;fedora;opensuse;sles"><prompt>#</prompt> <userinput>service openstack-nova-compute start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-nova-compute on</userinput></screen>
     </step>
diff --git a/doc/install-guide/section_nova-network.xml b/doc/install-guide/section_nova-network.xml
index f54ac097e81..75ed86ed407 100644
--- a/doc/install-guide/section_nova-network.xml
+++ b/doc/install-guide/section_nova-network.xml
@@ -27,7 +27,6 @@
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
   firewall_driver nova.virt.libvirt.firewall.IptablesFirewallDriver</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT network_size 254</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT routing_source_ip ADDRESS</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT allow_same_net_traffic False</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT multi_host True</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT send_arp_for_ha True</userinput>