Merge "More ubuntu fixes for install guide"

doc/common/section_dashboard_sessions.xml

@@ -43,6 +43,7 @@ CACHES = {
 }</programlisting>
     </section>
     <section xml:id="dashboard-session-key-value-store">
+        <?dbhtml stop-chunking?>
         <title>Key-value stores</title>
         <para>You can use applications such as Memcached or Redis for external
             caching. These applications offer persistence and shared storage

doc/install-guide/ch_basics.xml

@@ -257,7 +257,11 @@ hwclock -w</programlisting>
         and the MySQL Python library.</para>
         <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install python-mysqldb mysql-server</userinput></screen>
         <screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>yum install mysql mysql-server MySQL-python</userinput></screen>
-        <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install mysql-community-server-client mysql-community-server python-mysql</userinput></screen></listitem>
+        <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install mysql-community-server-client mysql-community-server python-mysql</userinput></screen>
+    <note os="ubuntu;debian"><para>When you install the server package, you will
+    be asked to enter a root password for the database. Be sure to choose
+    a strong password and remember it - it will be needed later.</para></note>
+</listitem>
       <listitem><para>On any nodes besides the controller node, just install the MySQL
         client and the MySQL Python library. This is all you need to do on any
         system not hosting the MySQL database.</para>
@@ -265,9 +269,7 @@ hwclock -w</programlisting>
         <screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>yum install mysql MySQL-python</userinput></screen>
         <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install mysql-community-server-client python-mysql</userinput></screen></listitem>
     </itemizedlist>
-    <note os="ubuntu;debian"><para>When you install the server package, you will
+
-    be asked to enter a root password for the database. Be sure to choose
-    a strong password and remember it - it will be needed later.</para></note>
 
     <para os="rhel;centos;fedora;opensuse">Start the MySQL database server and set it to start automatically when
       the system boots.</para>
@@ -284,7 +286,7 @@ hwclock -w</programlisting>
   </section>
   <section xml:id="basics-queue">
     <title>Messaging Server</title>
-    <para>Install the messaging queue server. Typically this is <phrase
+    <para>On the controller node, install the messaging queue server. Typically this is <phrase
         os="ubuntu;opensuse">RabbitMQ</phrase><phrase os="centos;rhel;fedora"
         >Qpid</phrase> but <phrase os="ubuntu;opensuse">Qpid</phrase><phrase
         os="centos;rhel;fedora">RabbitMQ</phrase> and ZeroMQ (0MQ) are also
@@ -366,7 +368,7 @@ hwclock -w</programlisting>
       </step>
       <step>
         <para>
-          Edit <filename>/etc/apt/sources.list.d/cloud-archive.list</filename>:
+          Create a new repository sources file <filename>/etc/apt/sources.list.d/cloud-archive.list</filename> containing:
           <programlisting>deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main</programlisting>
         </para>
       </step>

doc/install-guide/section_dashboard-install.xml

@@ -30,6 +30,15 @@
             <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install memcached libapache2-mod-wsgi openstack-dashboard</userinput></screen>
             <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install memcached python-memcached mod_wsgi openstack-dashboard</userinput></screen>
             <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install memcached python-python-memcached apache2-mod_wsgi openstack-dashboard</userinput></screen>
+        <note os="ubuntu">
+
+            <para>Remove the
+                    <literal>openstack-dashboard-ubuntu-theme</literal>
+                package. This theme prevents translations, several menus
+                as well as the network map from rendering correctly:
+                <screen><prompt>#</prompt> <userinput>apt-get remove --purge openstack-dashboard-ubuntu-theme</userinput></screen>
+            </para>
+        </note>
 </step>
 <step>
     <para>Modify the value of
@@ -93,6 +102,21 @@
                 </itemizedlist>
             </note>
         </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>
+      <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"
+                                >/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py</filename>
+       and change <literal>OPENSTACK_HOST</literal> to the hostname of your Identity Service.</para>
+            <programlisting language="bash" linenumbering="unnumbered"><?db-font-size 75%?>OPENSTACK_HOST = "controller"
+    </programlisting>
+        </step>
         <step>
           <para>You can now access the dashboard at <uri>http://controller/horizon</uri>.</para>
           <para>Login with credentials for any user that you created with the OpenStack Identity Service.</para>

doc/install-guide/section_nova-compute.xml

@@ -60,11 +60,7 @@
   <programlisting os="ubuntu;debian" language="ini">...
 [DEFAULT]
 ...
-auth_strategy=keystone
+auth_strategy=keystone</programlisting>
-auth_host=<replaceable>controller</replaceable>
-admin_user=nova
-admin_tenant_name=service
-admin_password=<replaceable>NOVA_DBPASS</replaceable></programlisting>
 
       <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \
   DEFAULT rpc_backend nova.openstack.common.rpc.impl_qpid</userinput>
@@ -114,8 +110,10 @@ admin_password=<replaceable>NOVA_DBPASS</replaceable>
       <note os="fedora;rhel;centos;opensuse"><para>Ensure that <filename>api_paste_config=/etc/nova/api-paste.ini</filename> is set in
         <filename>/etc/nova/nova.conf</filename>.</para></note>
       </step>
-    <step><para>Start the Compute service and configure it to start when the system boots.</para>
+    <step>
-      <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service nova-compute start</userinput></screen>
+    <para os="fedora;rhel;centos;opensuse">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="centos;rhel;fedora"><prompt>#</prompt> <userinput>service openstack-nova-compute start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-nova-compute on</userinput></screen>
       <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl start openstack-nova-compute</userinput>

doc/install-guide/section_nova-controller.xml

@@ -73,7 +73,7 @@ IDENTIFIED BY 'NOVA_DBPASS';</userinput></screen>
   <step>
   <para>Set the configuration keys <literal>my_ip</literal>,
   <literal>vncserver_listen</literal>, and
-  <literal>vncserver_proxyclient_address</literal> to the IP address of the
+  <literal>vncserver_proxyclient_address</literal> to the internal IP address of the
   controller node.</para>
 
   <screen os="fedora;rhel;centos;opensuse"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT my_ip 192.168.0.10</userinput>
@@ -101,9 +101,8 @@ vncserver_proxyclient_address=192.168.0.10
 <prompt>#</prompt> <userinput>keystone user-role-add --user=nova --tenant=service --role=admin</userinput></screen>
   </step>
   <step>
-  <para>For the Compute Service to use these credentials, you must add
+  <para>For the Compute Service to use these credentials, you must alter the <filename>nova.conf</filename> configuration file.</para>
-  them to the <filename>nova.conf</filename> configuration file.</para>
+  <!-- FIXME don't think this is necessary - now happens in api-paste.ini -->
-
   <screen os="fedora;rhel;centos;opensuse"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_strategy keystone</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_host <replaceable>controller</replaceable></userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_user nova</userinput>
@@ -115,10 +114,6 @@ vncserver_proxyclient_address=192.168.0.10
 [DEFAULT]
 ...
 auth_strategy=keystone
-auth_host=<replaceable>controller</replaceable>
-admin_user=nova
-admin_tenant_name=service
-admin_password=<replaceable>NOVA_DBPASS</replaceable>
       </programlisting>
 
 
@@ -134,8 +129,8 @@ admin_password=<replaceable>NOVA_DBPASS</replaceable>
   <programlisting language="ini">[filter:authtoken]
 paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory
 auth_host=<replaceable>controller</replaceable>
-admin_user=nova
 admin_tenant_name=service
+admin_user=nova
 admin_password=<replaceable>NOVA_DBPASS</replaceable>
 </programlisting>
   <note os="fedora;rhel;centos;opensuse;debian"><para>Ensure that <literal>api_paste_config=/etc/nova/api-paste.ini</literal>
@@ -172,8 +167,7 @@ admin_password=<replaceable>NOVA_DBPASS</replaceable>
 
     <step os="ubuntu;debian">
 <para>Configure the Compute Service to use the RabbitMQ
-  message broker by setting the following configuration keys. They are found in
+  message broker by setting the following configuration keys. Add them in the <literal>DEFAULT</literal> configuration group of the
-  the <literal>DEFAULT</literal> configuration group of the
   <filename>/etc/nova/nova.conf</filename> file.</para>
   <screen>rpc_backend = nova.rpc.impl_kombu
 rabbit_host = controller</screen>
@@ -186,15 +180,15 @@ rabbit_host = controller</screen>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT rabbit_host controller</userinput></screen>
    </step>
    <step>
-  <para>Finally, start the various Nova services and configure them
+  <para os="centos;fedora;rhel;opensuse">Finally, start the various Nova services and configure them
   to start when the system boots.</para>
-
+  <para os="ubuntu;debian">Finally, restart the various Nova services.</para>
   <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service nova-api start</userinput>
-<prompt>#</prompt> <userinput>service nova-cert start</userinput>
+<prompt>#</prompt> <userinput>service nova-cert restart</userinput>
-<prompt>#</prompt> <userinput>service nova-consoleauth start</userinput>
+<prompt>#</prompt> <userinput>service nova-consoleauth restart</userinput>
-<prompt>#</prompt> <userinput>service nova-scheduler start</userinput>
+<prompt>#</prompt> <userinput>service nova-scheduler restart</userinput>
-<prompt>#</prompt> <userinput>service nova-conductor start</userinput>
+<prompt>#</prompt> <userinput>service nova-conductor restart</userinput>
-<prompt>#</prompt> <userinput>service nova-novncproxy start</userinput></screen>
+<prompt>#</prompt> <userinput>service nova-novncproxy restart</userinput></screen>
   <screen os='centos;rhel;fedora'><prompt>#</prompt> <userinput>service openstack-nova-api start</userinput>
 <prompt>#</prompt> <userinput>service openstack-nova-cert start</userinput>
 <prompt>#</prompt> <userinput>service openstack-nova-consoleauth start</userinput>