Fix install instructions for ubuntu, part 2

This patch continues from the previous patch, fixing
installation instructions for ubuntu 12.04 server

1) changes to image service install

2) changes to dashboard install

Change-Id: Ic573edfe0c938049671d5fac9226af7dcf300b33

doc/install-guide/section_dashboard-install.xml

@@ -22,24 +22,24 @@
         <step>
             <para>Install the dashboard on the node that can contact
                 the Identity Service as root:</para>
-            <screen os="ubuntu" language="bash"><prompt>#</prompt> <userinput>apt-get install memcached libapache2-mod-wsgi openstack-dashboard</userinput></screen>
+            <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install memcached libapache2-mod-wsgi openstack-dashboard</userinput></screen>
-            <screen os="rhel;centos;fedora" language="bash"><prompt>#</prompt> <userinput>yum install memcached python-memcached 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" language="bash"><prompt>#</prompt> <userinput>zypper install memcached python-python-memcached apache2-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>
         </step>
         <step>
             <para>Modify the value of
                     <literal>CACHES['default']['LOCATION']</literal>
-                in <filename os="ubuntu"
+                in <filename os="ubuntu;debian"
                     >/etc/openstack-dashboard/local_settings.py</filename><filename
                     os="centos;fedora;rhel"
                     >/etc/openstack-dashboard/local_settings</filename><filename
                     os="opensuse"
                     >/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py</filename>
-                to match the ones set in <filename os="ubuntu"
+                to match the ones set in <filename os="ubuntu;debian"
                     >/etc/memcached.conf</filename><filename
                     os="centos;fedora;rhel;opensuse"
                     >/etc/sysconfig/memcached.conf</filename>.</para>
-            <para>Open <filename os="ubuntu"
+            <para>Open <filename os="ubuntu;debian"
                     >/etc/openstack-dashboard/local_settings.py</filename>
                 <filename os="centos;fedora;rhel"
                     >/etc/openstack-dashboard/local_settings</filename>
@@ -56,7 +56,7 @@
                 <itemizedlist>
                     <listitem>
                         <para>The address and port must match the ones
-                            set in <filename os="ubuntu"
+                            set in <filename os="ubuntu;debian"
                                 >/etc/memcached.conf</filename><filename
                                 os="centos;fedora;rhel;opensuse"
                                 >/etc/sysconfig/memcached</filename>.</para>
@@ -76,7 +76,7 @@
                             dashboard or edit the <filename
                                 os="centos;fedora;rhel"
                                 >/etc/openstack-dashboard/local_settings</filename><filename
-                                os="ubuntu"
+                                os="ubuntu;debian"
                                 >/etc/openstack-dashboard/local_settings.py</filename><filename
                                 os="opensuse"
                                 >/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py</filename>
@@ -89,21 +89,8 @@
             </note>
         </step>
         <step>
-            <para>Make sure that the web browser on your local machine
+          <para>You can now access the dashboard at <uri>http://controller/horizon</uri>.</para>
-                supports HTML5.</para>
+          <para>Login with credentials for any user that you created with the OpenStack Identity Service.</para>
-            <para>Enable cookies and JavaScript.</para>
-            <note>
-                <para>To use the VNC client with the dashboard, the
-                    browser must support HTML5 Canvas and HTML5
-                    WebSockets.</para>
-                <para>For details about browsers that support noVNC,
-                    see <link
-                        xlink:href="https://github.com/kanaka/noVNC/blob/master/README.md"
-                        >https://github.com/kanaka/noVNC/blob/master/README.md</link>,
-                    and <link
-                        xlink:href="https://github.com/kanaka/noVNC/wiki/Browser-support"
-                        >https://github.com/kanaka/noVNC/wiki/Browser-support</link>.</para>
-            </note>
         </step>
     </procedure>
 </section>

doc/install-guide/section_dashboard-system-reqs.xml

@@ -19,13 +19,6 @@
                 must run the dashboard as an Identity Service user
                 with sudo privileges.</para>
         </listitem>
-        <listitem>
-            <para><literal>git</literal>. Run the following command to
-                install <literal>git</literal>:</para>
-            <screen os="ubuntu" language="bash"><prompt>$</prompt> <userinput>sudo apt-get install git-core</userinput></screen>
-            <screen os="centos;rhel;fedora" language="bash"><prompt>$</prompt> <userinput>sudo yum install git</userinput></screen>
-            <screen os="opensuse" language="bash"><prompt>$</prompt> <userinput>sudo zypper install git</userinput></screen>
-        </listitem>
         <listitem>
             <para>Python 2.6 or 2.7. The Python version must support
                 Django. The Python version should run on any
@@ -48,7 +41,8 @@
                 access the dashboard</para>
         </listitem>
     </itemizedlist>
-    <para>Their web browser must support HTML5 and have cookies and
+    <para>Your web browser, and that of your users,
+         must support HTML5 and have cookies and
         JavaScript enabled.</para>
     <note>
         <para>To use the VNC client with the dashboard, the browser

doc/install-guide/section_glance-install.xml

@@ -20,28 +20,63 @@
   <procedure>
     <title>Install the Image Service</title>
     <step><para>Install the Image Service on the controller node.</para>
-      <screen os="ubuntu"><prompt>#</prompt> <userinput>sudo apt-get install glance</userinput></screen>
+      <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install glance</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-glance</userinput></screen>
       <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install openstack-glance</userinput></screen></step>
-    <step><para>The Image Service stores information about images in a database.
+
-      This guide uses the MySQL database used by other OpenStack services.
+    <step os="rhel;centos;fedora;opensuse"><para>The Image Service stores information about images in a database.
-      <phrase os="ubuntu">The Ubuntu packages create an sqlite database by
+      This guide uses the MySQL database used by other OpenStack services.</para>
-        default. Delete the <filename>glance.sqlite</filename> file created in
-        the <filename>/var/lib/glance/</filename> directory.</phrase></para>
       <para>Use the <command>openstack-db</command> command to create the
       database and tables for the Image Service, as well as a database user
       called <literal>glance</literal> to connect to the database. Replace
       <literal><replaceable>GLANCE_DBPASS</replaceable></literal> with a
       password of your choosing.</para>
       <screen><prompt>#</prompt> <userinput>openstack-db --init --service glance --password <replaceable>GLANCE_DBPASS</replaceable></userinput></screen></step>
+
+    <step os="ubuntu;debian">
+    <para>The Image Service stores information about images in a database.
+      This guide uses the MySQL database used by other OpenStack services.
+      The Ubuntu packages create an sqlite database by
+        default. Delete the <filename>glance.sqlite</filename> file created in
+        the <filename>/var/lib/glance/</filename> directory so it is not used by mistake.</para>
+      <para>First, we need to create a database user called <literal>glance</literal>, by logging in
+      as root using the password we set earlier.</para>
+      <screen><prompt>#</prompt> <userinput>mysql -u root -p</userinput>
+<prompt>mysql></prompt> <userinput>CREATE DATABASE glance;</userinput>
+<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' \
+IDENTIFIED BY 'GLANCE_DBPASS';</userinput></screen>
+    </step>
+
+
     <step><para>Tell the Image Service to use the created database. The Image Service provides two OpenStack
         services: <literal>glance-api</literal> and <literal>glance-registry</literal>. They each
         have separate configuration files, so you must configure both files throughout this
         section.</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf \
+      <screen os="rhel;centos;fedora;opensuse"><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf \
   DEFAULT sql_connection mysql://glance:<replaceable>GLANCE_PASS</replaceable>@<replaceable>controller</replaceable>/glance</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-registry.conf \
-  DEFAULT sql_connection mysql://glance:<replaceable>GLANCE_PASS</replaceable>@<replaceable>controller</replaceable>/glance</userinput></screen></step>
+  DEFAULT sql_connection mysql://glance:<replaceable>GLANCE_PASS</replaceable>@<replaceable>controller</replaceable>/glance</userinput></screen>
+      <para os="ubuntu;debian">Edit <filename>/etc/glance/glance-api.conf</filename> and  <filename>/etc/glance/glance-registry.conf</filename>
+       and change the <literal>[DEFAULT]</literal> section.</para>
+      <programlisting os="ubuntu;debian" language="ini">
+...
+[DEFAULT]
+...
+# SQLAlchemy connection string for the reference implementation
+# registry server. Any valid SQLAlchemy connection string is fine.
+# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
+sql_connection = mysql://glance:GLANCE_DBPASS@localhost/glance
+...
+      </programlisting>
+
+</step>
+
+    <step os="ubuntu;debian">
+      <para>We now create the database tables for the Image service.</para>
+      <screen><prompt>#</prompt> <userinput>glance-manage db_sync</userinput></screen>
+    </step>
+
+
     <step><para>Create a user called <literal>glance</literal> that the Image
       Service can use to authenticate with the Identity Service. Use the
       <literal>service</literal> tenant and give the user the
@@ -49,7 +84,8 @@
       <screen><prompt>#</prompt> <userinput>keystone user-create --name=glance --pass=<replaceable>GLANCE_PASS</replaceable> --email=<replaceable>glance@example.com</replaceable></userinput>
 <prompt>#</prompt> <userinput>keystone user-role-add --user=glance --tenant=service --role=admin</userinput></screen></step>
     <step><para>Add the credentials to the Image Service's configuration files.</para>
-      <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf keystone_authtoken auth_host <replaceable>controller</replaceable></userinput>
+
+      <screen os="centos;rhel;fedora;opensuse"><prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf keystone_authtoken auth_host <replaceable>controller</replaceable></userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf keystone_authtoken admin_user glance</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf keystone_authtoken admin_tenant_name service</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-api.conf keystone_authtoken admin_password <replaceable>GLANCE_PASS</replaceable></userinput>
@@ -57,6 +93,20 @@
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-registry.conf keystone_authtoken admin_user glance</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-registry.conf keystone_authtoken admin_tenant_name service</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/glance/glance-registry.conf keystone_authtoken admin_password <replaceable>GLANCE_PASS</replaceable></userinput></screen>
+      <para os="ubuntu;debian">Edit <filename>/etc/glance/glance-api.conf</filename> and <filename>/etc/glance/glance-registry.conf</filename>
+ and change the <literal>[keystone_authtoken]</literal> section.</para>
+      <programlisting os="ubuntu;debian" language="ini">
+...
+[keystone_authtoken]
+auth_host = controller
+auth_port = 35357
+auth_protocol = http
+admin_tenant_name = service
+admin_user = glance
+admin_password = GLANCE_PASS
+...
+      </programlisting>
+
       <!-- <para>You also have to add the credentials to the files
   <filename>/etc/glance/glance-api-paste.ini</filename> and
   <filename>/etc/glance/glance-registry-paste.ini</filename>. Open each file
@@ -72,6 +122,7 @@ admin_password=<replaceable>GLANCE_PASS</replaceable></programlisting> -->
         <note><para>If you have troubles connecting to the database, try using the IP address instead of the
           host name in the credentials.</para></note>
       </para></step>
+
     <step><para>Register the Image Service with the Identity Service
       so that other OpenStack services can locate it. Register the service and
       specify the endpoint using the <command>keystone</command> command.</para>
@@ -84,13 +135,18 @@ admin_password=<replaceable>GLANCE_PASS</replaceable></programlisting> -->
   --publicurl=http://<replaceable>controller</replaceable>:9292 \
   --internalurl=http://<replaceable>controller</replaceable>:9292 \
   --adminurl=http://<replaceable>controller</replaceable>:9292</userinput></screen></step>
-    <step><para>Start the <literal>glance-api</literal> and
+
+    <step os="ubuntu;debian">
+      <para>We now restart the glance service with its new settings.</para>
+<screen><prompt>#</prompt> <userinput>service glance-registry restart</userinput>
+<prompt>#</prompt> <userinput>service glance-api restart</userinput></screen>
+    </step>
+
+
+
+    <step os="rhel;fedora;centos;opensuse"><para>Start the <literal>glance-api</literal> and
       <literal>glance-registry</literal> services and configure them to
       start when the system boots.</para>
-      <screen os="ubuntu"><prompt>#</prompt> <userinput>service glance-api start</userinput>
-<prompt>#</prompt> <userinput>service glance-registry start</userinput>
-<prompt>#</prompt> <userinput>chkconfig glance-api on</userinput>
-<prompt>#</prompt> <userinput>chkconfig glance-registry on</userinput></screen>
       <screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>service openstack-glance-api start</userinput>
 <prompt>#</prompt> <userinput>service openstack-glance-registry start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-glance-api on</userinput>

doc/install-guide/section_nova-controller.xml

@@ -11,7 +11,8 @@
   most of the services on the controller node, and use a dedicated compute
   node to run the service that launches virtual machines. This section
   details the installation and configuration on the controller node.</para>
-
+  <procedure>
+  <step>
   <para os="fedora;rhel;centos;opensuse">Install the <literal>openstack-nova</literal>
   meta-package. This package will install all of the various Nova packages, most of
   which will be used on the controller node in this guide.</para>
@@ -19,28 +20,54 @@
   <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>yum install openstack-nova</userinput></screen>
   <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install openstack-nova</userinput></screen>
 
-  <para os="ubuntu">Install the following Nova packages. These packages provide
+  <para os="ubuntu;debian">Install the following Nova packages. These packages provide
   the OpenStack Compute services that will be run on the controller node in this
   guide.</para>
 
-  <screen os="ubuntu"><prompt>#</prompt> <userinput>apt-get install nova-novncproxy novnc nova-api nova-ajax-console-proxy nova-cert \
+  <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install nova-novncproxy novnc nova-api nova-ajax-console-proxy nova-cert \
   nova-conductor nova-consoleauth nova-doc nova-scheduler nova-network</userinput></screen>
+  </step>
 
+  <step>
   <para>The Compute Service stores information in a database. This guide uses
-  the MySQL database used by other OpenStack services. Use the
+  the MySQL database used by other OpenStack services.</para>
+  <para os="fedora;rhel;centos;opensuse"> Use the
   <command>openstack-db</command> command to create the database and tables
   for the Compute Service, as well as a database user called
   <literal>nova</literal> to connect to the database. Replace
   <literal><replaceable>NOVA_DBPASS</replaceable></literal> with a
   password of your choosing.</para>
+  <screen os="fedora;rhel;centos;opensuse"><prompt>#</prompt> <userinput>openstack-db --init --service nova --password <replaceable>NOVA_DBPASS</replaceable></userinput></screen>
+  <para os="ubuntu;debian">Edit <filename>/etc/nova/nova.conf</filename> and change the <literal>[database]</literal> section.</para>
+  <programlisting os="ubuntu;debian" language="ini">
+...
+[database]
+# The SQLAlchemy connection string used to connect to the database
+connection = mysql://nova:NOVA_DBPASS@controller/nova
+...
+      </programlisting>
+    </step>
+    <step os="ubuntu;debian">
+      <para>Next, we need to create a database user called <literal></literal>, by logging in
+      as root using the password we set earlier.</para>
+      <screen><prompt>#</prompt> <userinput>mysql -u root -p</userinput>
+<prompt>mysql></prompt> <userinput>CREATE DATABASE nova;</userinput>
+<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON nova.* TO 'nova'@'localhost' \
+IDENTIFIED BY 'NOVA_DBPASS';</userinput></screen>
+    </step>
+    <step os="ubuntu;debian">
+      <para>We now create the tables for the nova service.</para>
+      <screen><prompt>#</prompt> <userinput>nova-manage db_sync</userinput></screen>
+    </step>
 
-  <screen><prompt>#</prompt> <userinput>openstack-db --init --service nova --password <replaceable>NOVA_DBPASS</replaceable></userinput></screen>
+  <step os="fedora;rhel;centos;opensuse">
-
   <para>You now have to tell the Compute Service to use that database.</para>
 
   <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \
   database connection mysql://nova:<replaceable>NOVA_DBPASS</replaceable>@controller/nova</userinput></screen>
 
+  </step>
+  <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
@@ -49,7 +76,8 @@
   <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT my_ip 192.168.0.10</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_listen 192.168.0.10</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_proxyclient_address 192.168.0.10</userinput></screen>
-
+  </step>
+  <step>
   <para>Create a user called <literal>nova</literal> that the Compute Service
   can use to authenticate with the Identity Service. Use the
   <literal>service</literal> tenant and give the user the
@@ -57,7 +85,8 @@
 
   <screen><prompt>#</prompt> <userinput>keystone user-create --name=nova --pass=<replaceable>NOVA_PASS</replaceable> --email=<replaceable>nova@example.com</replaceable></userinput>
 <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 have to add
   them to the <filename>nova.conf</filename> configuration file.</para>
 
@@ -67,6 +96,8 @@
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_tenant_name service</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_PASS</replaceable></userinput></screen>
 
+  </step>
+  <step>
   <para>You also have to add the credentials to the file
   <filename>/etc/nova/api-paste.ini</filename>. Open the file in a text editor
   and locate the section <literal>[filter:authtoken]</literal>.
@@ -79,7 +110,8 @@ admin_user=nova
 admin_tenant_name=service
 admin_password=<replaceable>NOVA_PASS</replaceable>
 </programlisting>
-
+  </step>
+  <step>
   <para>You have to register the Compute Service with the Identity Service
   so that other OpenStack services can locate it. Register the service and
   specify the endpoint using the <command>keystone</command> command.</para>
@@ -96,7 +128,8 @@ admin_password=<replaceable>NOVA_PASS</replaceable>
   --internalurl=http://controller:8774/v2/%(tenant_id)s \
   --adminurl=http://controller:8774/v2/%(tenant_id)s</userinput></screen>
 
-
+  </step>
+  <step>
   <para os="fedora;rhel;centos">Configure the Compute Service to use the
   Qpid message broker by setting the following configuration keys.</para>
 
@@ -118,7 +151,8 @@ rabbit_host = controller</screen>
   <screen os="opensuse"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \
   DEFAULT rpc_backend nova.rpc.impl_kombu</userinput>
 <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
   to start when the system boots.</para>
 
@@ -158,7 +192,8 @@ rabbit_host = controller</screen>
 <prompt>#</prompt> <userinput>systemctl enable openstack-nova-scheduler.service</userinput>
 <prompt>#</prompt> <userinput>systemctl enable openstack-nova-conductor.service</userinput>
 <prompt>#</prompt> <userinput>systemctl enable openstack-nova-novncproxy.service</userinput></screen>
-
+  </step>
+  <step>
   <para>To verify that everything is configured correctly, use the
   <command>nova image-list</command> to get a list of available images. The
   output is similar to the output of <command>glance image-list</command>.</para>
@@ -169,5 +204,6 @@ rabbit_host = controller</screen>
 +--------------------------------------+-----------------+--------+--------+
 | acafc7c0-40aa-4026-9673-b879898e1fc2 | CirrOS 0.3.1    | ACTIVE |        |
 +--------------------------------------+-----------------+--------+--------+</computeroutput></screen>
-
+  </step>
+  </procedure>
 </section>