Bug fixes for install and config

bug 1017767 - adds comment about guest/guest defaults for rabbitmq
in sample glance conf file
bug 1026890 - added note about nova.conf file ownership being exception
bug 1042847 - looks like these are addressed in master but not in stable/essex;
will backport this patch as it is okay for both folsom and essex docs

Change-Id: I8625bc85341276225d738eea189f71ce9e2c672e

doc/src/docbkx/openstack-install/bk_openstackinstallguide.xml

@@ -39,20 +39,16 @@
                 OpenStack Object Storage, OpenStack Identity Service,
                 and OpenStack Image Service. You can install any of
                 these projects separately and then configure them
-                either as standalone or connected entities. 
-
-                <phrase os="ubuntu">This guide
-                walks through an installation using packages available
-                through Ubuntu 12.04.</phrase>
-
-                <phrase os="rhel;centos;fedora">This guide
-                walks through an installation using packages available
-                through Fedora 17 as well as on RHEL and derivatives through
-                the EPEL repository.</phrase>
-
-                It offers explanations for the
-                configuration choices as well as sample configuration
-                files. </para>
+                either as standalone or connected entities. <phrase
+                    os="ubuntu">This guide walks through an
+                    installation using packages available through
+                    Ubuntu 12.04.</phrase>
+                <phrase os="rhel;centos;fedora">This guide walks
+                    through an installation using packages available
+                    through Fedora 17 as well as on RHEL and
+                    derivatives through the EPEL repository.</phrase>
+                It offers explanations for the configuration choices
+                as well as sample configuration files. </para>
         </abstract>
         <revhistory>
             <revision>

doc/src/docbkx/openstack-install/compute-minimum-configuration.xml

@@ -48,16 +48,19 @@ Options:
         should ensure that the <filename>nova.conf</filename> file should have its
         owner set to <literal>root:nova</literal>, and mode set to <literal>0640</literal>, since the
         file contains your MySQL server’s username and password.
+        
+    </para>
+    <note><para>If you are installing as another user, you should set permissions correctly. 
         This packaged install ensures that the nova user belongs
         to the nova group and that the .conf file permissions are
-        set, but here are the manual commands, which should be run as root:
-    </para>
+        set, but here are the manual commands, which should be run as root:</para>
 <screen>
 <prompt># </prompt><userinput>groupadd nova</userinput>
 <prompt># </prompt><userinput>usermod -g nova nova</userinput>
-<prompt># </prompt><userinput>chown -R root:nova /etc/nova</userinput>
+<prompt># </prompt><userinput>chown -R <option>username</option>:nova /etc/nova</userinput>
 <prompt># </prompt><userinput>chmod 640 /etc/nova/nova.conf</userinput>
 </screen>
+    </note>
     <para>The hypervisor is set either by editing <filename>/etc/nova/nova.conf</filename> or referring to
         <filename>nova-compute.conf</filename> in the <filename>nova.conf</filename> file. The hypervisor defaults to <literal>kvm</literal>, but if you are
         working within a VM already, switch to <literal>qemu</literal> on the <literal>libvirt_type=</literal> line. To use Xen, refer

doc/src/docbkx/openstack-install/samples/glance-api.conf

@@ -38,7 +38,8 @@ use_syslog = False
 notifier_strategy = noop
 
 # Configuration options if sending notifications via rabbitmq (these are
-# the defaults)
+# the defaults, substitute something else for guest/guest rather than 
+# using the defaults)
 rabbit_host = localhost
 rabbit_port = 5672
 rabbit_use_ssl = false