Merge "Install fixes, from following the guide."

doc/config-reference/ch_imageservice.xml

@@ -29,10 +29,7 @@
     <xi:include href="../common/tables/glance-common.xml"/>
     <xi:include href="../common/tables/glance-amqp.xml"/>
     <xi:include href="../common/tables/glance-api.xml"/>
-    <xi:include href="../common/tables/glance-cinder.xml"/>
     <xi:include href="../common/tables/glance-db.xml"/>
-    <xi:include href="../common/tables/glance-filesystem.xml"/>
-    <xi:include href="../common/tables/glance-gridfs.xml"/>
     <xi:include href="../common/tables/glance-imagecache.xml"/>
     <xi:include href="../common/tables/glance-logging.xml"/>
     <xi:include href="../common/tables/glance-matchmaker.xml"/>
@@ -40,17 +37,13 @@
     <xi:include href="../common/tables/glance-policy.xml"/>
     <xi:include href="../common/tables/glance-qpid.xml"/>
     <xi:include href="../common/tables/glance-rabbitmq.xml"/>
-    <xi:include href="../common/tables/glance-rbd.xml"/>
     <xi:include href="../common/tables/glance-redis.xml"/>
     <xi:include href="../common/tables/glance-registry.xml"/>
     <xi:include href="../common/tables/glance-rpc.xml"/>
-    <xi:include href="../common/tables/glance-s3.xml"/>
-    <xi:include href="../common/tables/glance-sheepdog.xml"/>
     <xi:include href="../common/tables/glance-ssl.xml"/>
-    <xi:include href="../common/tables/glance-swift.xml"/>
     <xi:include href="../common/tables/glance-testing.xml"/>
-    <xi:include href="../common/tables/glance-vmware.xml"/>
     <xi:include href="../common/tables/glance-wsgi.xml"/>
     <xi:include href="../common/tables/glance-zmq.xml"/>
+   <xi:include href="image-service/section_image-service-backends.xml"/>
   <xi:include href="image-service/section_image-service-sample-configuration-files.xml" />
 </chapter>

doc/config-reference/image-service/section_image-service-backends.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="configuring-image-service-backends"
+  xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:ns5="http://www.w3.org/1999/xhtml"
+  xmlns:ns4="http://www.w3.org/2000/svg"
+  xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+  xmlns:ns="http://docbook.org/ns/docbook">
+  <title>Configuring Backends</title>
+    <para>The image service supports several different backends
+    for storing virtual machine images, including Cinder, a directory on a
+    local file system, GridFS, Ceph RBD, Amazon S3, Sheepdog, OpenStack Object
+    Storage or VMWare ESX. The following tables detail the options available
+    for each.</para>
+    <xi:include href="../../common/tables/glance-cinder.xml"/>
+    <xi:include href="../../common/tables/glance-filesystem.xml"/>
+    <xi:include href="../../common/tables/glance-gridfs.xml"/>
+    <xi:include href="../../common/tables/glance-rbd.xml"/>
+    <xi:include href="../../common/tables/glance-s3.xml"/>
+    <xi:include href="../../common/tables/glance-sheepdog.xml"/>
+    <xi:include href="../../common/tables/glance-swift.xml"/>
+    <xi:include href="../../common/tables/glance-vmware.xml"/>
+</section>

doc/install-guide/ch_clients.xml

@@ -4,6 +4,14 @@
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="ch_clients">
     <title>Install and configure the OpenStack clients</title>
+    <para>The following sections contain information about working
+        with the OpenStack clients. Recall: in the previous section,
+        you used the <command>keystone</command> client.</para>
+    <para>You must install the client tools to complete the rest of
+        the installation.</para>
+    <para>Configure the clients on your desktop rather than on the
+        server so that you have a similar experience to your
+        users.</para>
     <xi:include href="../common/section_cli_overview.xml"/>
     <xi:include href="../common/section_cli_install.xml"/>
     <xi:include href="../common/section_cli_openrc.xml"/>

doc/install-guide/ch_glance.xml

@@ -1,35 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="ch_glance">
+  xml:id="ch_glance">
-    <title>Configure the Image Service</title>
+  <title>Configure the Image Service</title>
-    <para>The OpenStack Image Service enables users to discover,
+  <para>The OpenStack Image Service enables users to discover,
-        register, and retrieve virtual machine images. Also known as
+    register, and retrieve virtual machine images. Also known as the
-        the glance project, the Image Service offers a
+    glance project, the Image Service offers a <glossterm
-        <glossterm baseform="RESTful">REST</glossterm> API that
+      baseform="RESTful">REST</glossterm> API that enables you to
-        enables you to query virtual machine image metadata and
+    query virtual machine image metadata and retrieve an actual image.
-        retrieve an actual image. Virtual machine images made
+    You can store virtual machine images made available through the
-        available through the Image Service can be stored in a variety
+    Image Service in a variety of locations from simple file systems
-        of locations from simple file systems to object-storage
+    to object-storage systems like OpenStack Object Storage.</para>
-        systems like OpenStack Object Storage.</para>
+  <important>
-    <important>
+    <para>For simplicity, this guide configures the Image Service to
-      <para>
+      use the <literal>file</literal> back end. This means that images
-        For simplicity this guide configures the Image Service to use the
+      uploaded to the Image Service are stored in a directory on the
-        <literal>file</literal> backend. This means that images uploaded to
+      same system that hosts the service. By default, this directory
-        the Image Service will be stored in a directory on the same system that
+      is <filename>/var/lib/glance/images/</filename>.</para>
-        hosts the service. By default this directory is
+    <para>Before you proceed, ensure that the system has sufficient
-        <filename>/var/lib/glance/images/</filename>.
+      space available in this directory to store virtual machine
-      </para>
+      images and snapshots. At an absolute minimum, several gigabytes
-      <para>
+      of space should be available for use by the Image Service in a
-        Ensure that the system has sufficient space available under this
+      proof of concept deployment. To see requirements for other back
-        directory to store virtual machine images and snapshots before
+      ends, see <link
-        proceeding. At an absolute minimum several gigabytes of space should
+        xlink:href="http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-image-service.html"
-        be available for use by the Image Service in a proof of concept
+          ><citetitle>Configuration
-        deployment.
+      Reference</citetitle></link>.</para>
-      </para>
+  </important>
-    </important>
+  <xi:include href="../common/section_getstart_image.xml"/>
-    <xi:include href="../common/section_getstart_image.xml"/>
+  <xi:include href="section_glance-install.xml"/>
-    <xi:include href="section_glance-install.xml"/>
+  <xi:include href="section_glance-verify.xml"/>
-    <xi:include href="section_glance-verify.xml"/>
 </chapter>

doc/install-guide/section_nova-controller.xml

@@ -74,6 +74,32 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT rabbit_host controller</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
     </step>
+    <step>
+      <para>Set the <option>my_ip</option>,
+          <option>vncserver_listen</option>, and
+          <option>vncserver_proxyclient_address</option>
+        configuration options to the internal IP address of the
+        controller node:</para>
+      <screen os="fedora;rhel;centos;opensuse;sles"><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>
+      <para os="ubuntu">Edit the
+          <filename>/etc/nova/nova.conf</filename> file and add these
+        lines to the <literal>[DEFAULT]</literal> section:</para>
+      <para os="debian">In Debian, the <package>debconf</package>
+        package automatically sets up <literal>my_ip</literal>
+        parameter but you must edit the
+          <filename>/etc/nova/nova.conf</filename> file to configure
+        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">...
+[DEFAULT]
+...
+my_ip = 192.168.0.10
+vncserver_listen = 192.168.0.10
+vncserver_proxyclient_address = 192.168.0.10</programlisting>
+    </step>
 
     <step os="fedora;rhel;centos;opensuse;sles">
       <para>Run the <command>openstack-db</command> command to create
@@ -101,32 +127,6 @@ IDENTIFIED BY '<replaceable>NOVA_DBPASS</replaceable>';</userinput></screen>
       <para>Create the Compute service tables:</para>
       <screen><prompt>#</prompt> <userinput>nova-manage db sync</userinput></screen>
     </step>
-    <step>
-      <para>Set the <option>my_ip</option>,
-          <option>vncserver_listen</option>, and
-          <option>vncserver_proxyclient_address</option>
-        configuration options to the internal IP address of the
-        controller node:</para>
-      <screen os="fedora;rhel;centos;opensuse;sles"><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>
-      <para os="ubuntu">Edit the
-          <filename>/etc/nova/nova.conf</filename> file and add these
-        lines to the <literal>[DEFAULT]</literal> section:</para>
-      <para os="debian">In Debian, the <package>debconf</package>
-        package automatically sets up <literal>my_ip</literal>
-        parameter but you must edit the
-          <filename>/etc/nova/nova.conf</filename> file to configure
-        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">...
-[DEFAULT]
-...
-my_ip=192.168.0.10
-vncserver_listen=192.168.0.10
-vncserver_proxyclient_address=192.168.0.10</programlisting>
-    </step>
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu">
       <para>Create a <literal>nova</literal> user that Compute uses to
         authenticate with the Identity Service. Use the