Minor fixes for the nova section (install guide)

- Spacing/formatting updates
- Set the rpc_backend value to 'rabbit' for debian/ubuntu. This probably
  needs to be done for SUSE/RHEL ('rabbit' or 'qpid') but needs to be
  validated first.
- Simplify some examples
- On Ubuntu, remove the sqlite database before restarting the services

Change-Id: I0469e07d657ccd6a183caedf37cb0219d896be56

doc/install-guide/section_nova-boot.xml

@@ -46,8 +46,7 @@
             ><citetitle>OpenStack Admin User
         Guide</citetitle></link>.</para>
       <screen><prompt>$</prompt> <userinput>ssh-keygen</userinput>
-<prompt>$</prompt> <userinput>cd .ssh</userinput>
+          <prompt>$</prompt> <userinput>nova keypair-add --pub_key ~/.ssh/id_rsa.pub mykey</userinput></screen>
-<prompt>$</prompt> <userinput>nova keypair-add --pub_key id_rsa.pub mykey</userinput></screen>
       <para>You have just created the <literal>mykey</literal>
         keypair. The <literal>id_rsa</literal> private key is saved
         locally in <filename>~/.ssh</filename>, which you can use to
@@ -100,7 +99,7 @@
       <screen><prompt>$</prompt> <userinput>nova boot --flavor <replaceable>flavorType</replaceable> --key_name <replaceable>keypairName</replaceable> --image <replaceable>ID</replaceable> <replaceable>newInstanceName</replaceable></userinput> </screen>
       <para>Create an instance by using flavor 1 or 2. For
         example:</para>
-      <screen><prompt>$</prompt> <userinput>nova boot --flavor 1 --key_name mykey --image 9e5c2bee-0373-414c-b4af-b91b0246ad3b --security_group default cirrOS</userinput>
+      <screen><prompt>$</prompt> <userinput>nova boot --flavor 1 --key-name mykey --image "CirrOS 0.3.1" --security-groups default cirrOS</userinput>
 <computeroutput>+--------------------------------------+--------------------------------------+
 | Property                             | Value                                |
 +--------------------------------------+--------------------------------------+

doc/install-guide/section_nova-compute.xml

@@ -119,10 +119,9 @@ dpkg-statoverride --update --add root root 0644 /boot/vmlinuz-${version}</progra
     <para os="ubuntu;debian">Edit the
           <filename>/etc/nova/nova.conf</filename> configuration file and add these
         lines to the appropriate sections:</para>
-      <programlisting os="ubuntu;debian" language="ini">...
+      <programlisting os="ubuntu;debian" language="ini">[DEFAULT]
-[DEFAULT]
 ...
-auth_strategy=keystone
+auth_strategy = keystone
 ...
 [database]
 # The SQLAlchemy connection string used to connect to the database
@@ -147,7 +146,9 @@ admin_password = <replaceable>NOVA_PASS</replaceable></programlisting>
         the RabbitMQ message broker by setting these configuration
         keys in the <literal>[DEFAULT]</literal> configuration group of
         the <filename>/etc/nova/nova.conf</filename> file:</para>
-      <programlisting os="ubuntu" language="ini">rpc_backend = nova.rpc.impl_kombu
+      <programlisting os="ubuntu" language="ini">[DEFAULT]
+...
+rpc_backend = rabbit
 rabbit_host = controller
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
       <para os="opensuse;sles">Configure the Compute service to use the RabbitMQ message broker
@@ -188,14 +189,14 @@ novncproxy_base_url=http://<replaceable>controller</replaceable>:6080/vnc_auto.h
       <screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT glance_host <replaceable>controller</replaceable></userinput></screen>
       <programlisting os="ubuntu;debian" language="ini">[DEFAULT]
 ...
-glance_host=<replaceable>controller</replaceable></programlisting>
+glance_host = <replaceable>controller</replaceable></programlisting>
     </step>
     <step>
       <para>If you install Compute on a virtual machine for testing
         purposes, you must determine whether your hypervisor and/or CPU
         support nested hardware acceleration using the following
         command:</para>
-      <screen><prompt>#</prompt> <userinput>egrep -c '(vmx|svm)' /proc/cpuinfo</userinput></screen>
+      <screen><prompt>$</prompt> <userinput>egrep -c '(vmx|svm)' /proc/cpuinfo</userinput></screen>
       <para>If this command returns a value of
         <emphasis>one or greater</emphasis>, your hypervisor and/or CPU
         support nested hardware acceleration which requires no
@@ -217,11 +218,15 @@ virt_type = qemu</programlisting>
         Configure <literal>libvirt</literal> to use QEMU:</para>
       <screen os="rhel;centos;fedora;sles;opensuse"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf libvirt virt_type qemu</userinput></screen>
     </step>
+    <step os="ubuntu">
+      <para>Remove the SQLite database created by the packages:</para>
+      <screen><prompt>#</prompt> <userinput>rm /var/lib/nova/nova.sqlite</userinput></screen>
+    </step>
     <step>
       <para os="fedora;rhel;centos;opensuse;sles">Start the Compute
         service and configure it to start when the system
-        boots.</para>
+        boots:</para>
-      <para os="ubuntu;debian">Restart the Compute service.</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>
@@ -234,9 +239,5 @@ virt_type = qemu</programlisting>
 <prompt>#</prompt> <userinput>service openstack-nova-compute start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-nova-compute on</userinput></screen>
     </step>
-    <step os="ubuntu">
-      <para>Remove the SQLite database created by the packages:</para>
-      <screen><prompt>#</prompt> <userinput>rm /var/lib/nova/nova.sqlite</userinput></screen>
-    </step>
   </procedure>
 </section>

doc/install-guide/section_nova-controller.xml

@@ -62,7 +62,9 @@ connection = mysql://nova:<replaceable>NOVA_DBPASS</replaceable>@controller/nova
         setting these configuration keys in the <literal>[DEFAULT]</literal>
         configuration group of the <filename>/etc/nova/nova.conf</filename>
         file:</para>
-      <programlisting language="ini">rpc_backend = nova.rpc.impl_kombu
+      <programlisting language="ini">[DEFAULT]
+...
+rpc_backend = rabbit
 rabbit_host = controller
 rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
     </step>
@@ -93,8 +95,7 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
         the <option>vncserver_listen</option> and
           <option>vncserver_proxyclient_address</option> options,
         which appear at the end of the file:</para>
-      <programlisting os="ubuntu;debian" language="ini">...
+      <programlisting os="ubuntu;debian" language="ini">[DEFAULT]
-[DEFAULT]
 ...
 my_ip = 192.168.0.10
 vncserver_listen = 192.168.0.10
@@ -111,7 +112,8 @@ vncserver_proxyclient_address = 192.168.0.10</programlisting>
       <para>By default, the Ubuntu packages create an SQLite database.
         Delete the <filename>nova.sqlite</filename> file created in
         the <filename>/var/lib/nova/</filename> directory so that it
-        does not get used by mistake.</para>
+        does not get used by mistake:</para>
+      <screen><prompt>#</prompt> <userinput>rm /var/lib/nova/nova.sqlite</userinput></screen>
     </step>
     <step os="ubuntu">
       <para>Use the password you created previously to log in as root.
@@ -154,7 +156,7 @@ IDENTIFIED BY '<replaceable>NOVA_DBPASS</replaceable>';</userinput></screen>
       <programlisting os="ubuntu;debian" language="ini">
 [DEFAULT]
 ...
-auth_strategy=keystone</programlisting>
+auth_strategy = keystone</programlisting>
       <para os="ubuntu;debian">Add these keys to the
         <literal>[keystone_authtoken]</literal> section:</para>
       <programlisting os="ubuntu;debian" language="ini">