diff --git a/doc/config-reference/ch_imageservice.xml b/doc/config-reference/ch_imageservice.xml
index db8f63390e..a49ecce259 100644
--- a/doc/config-reference/ch_imageservice.xml
+++ b/doc/config-reference/ch_imageservice.xml
@@ -29,10 +29,7 @@
-
-
-
@@ -40,17 +37,13 @@
-
-
-
-
-
+
diff --git a/doc/config-reference/image-service/section_image-service-backends.xml b/doc/config-reference/image-service/section_image-service-backends.xml
new file mode 100644
index 0000000000..c82a233406
--- /dev/null
+++ b/doc/config-reference/image-service/section_image-service-backends.xml
@@ -0,0 +1,24 @@
+
+
+ Configuring Backends
+ 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.
+
+
+
+
+
+
+
+
+
diff --git a/doc/install-guide/ch_clients.xml b/doc/install-guide/ch_clients.xml
index fe324a2c28..7fb0791afd 100644
--- a/doc/install-guide/ch_clients.xml
+++ b/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">
Install and configure the OpenStack clients
+ The following sections contain information about working
+ with the OpenStack clients. Recall: in the previous section,
+ you used the keystone client.
+ You must install the client tools to complete the rest of
+ the installation.
+ Configure the clients on your desktop rather than on the
+ server so that you have a similar experience to your
+ users.
diff --git a/doc/install-guide/ch_glance.xml b/doc/install-guide/ch_glance.xml
index ce5ccebcd3..c664f2065b 100644
--- a/doc/install-guide/ch_glance.xml
+++ b/doc/install-guide/ch_glance.xml
@@ -1,35 +1,34 @@
- Configure the Image Service
- The OpenStack Image Service enables users to discover,
- register, and retrieve virtual machine images. Also known as
- the glance project, the Image Service offers a
- REST API that
- enables you to query virtual machine image metadata and
- retrieve an actual image. Virtual machine images made
- available through the Image Service can be stored in a variety
- of locations from simple file systems to object-storage
- systems like OpenStack Object Storage.
-
-
- For simplicity this guide configures the Image Service to use the
- file backend. This means that images uploaded to
- the Image Service will be stored in a directory on the same system that
- hosts the service. By default this directory is
- /var/lib/glance/images/.
-
-
- Ensure that the system has sufficient space available under this
- directory to store virtual machine images and snapshots before
- proceeding. At an absolute minimum several gigabytes of space should
- be available for use by the Image Service in a proof of concept
- deployment.
-
-
-
-
-
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+ xml:id="ch_glance">
+ Configure the Image Service
+ The OpenStack Image Service enables users to discover,
+ register, and retrieve virtual machine images. Also known as the
+ glance project, the Image Service offers a REST API that enables you to
+ query virtual machine image metadata and retrieve an actual image.
+ You can store virtual machine images made available through the
+ Image Service in a variety of locations from simple file systems
+ to object-storage systems like OpenStack Object Storage.
+
+ For simplicity, this guide configures the Image Service to
+ use the file back end. This means that images
+ uploaded to the Image Service are stored in a directory on the
+ same system that hosts the service. By default, this directory
+ is /var/lib/glance/images/.
+ Before you proceed, ensure that the system has sufficient
+ space available in this directory to store virtual machine
+ images and snapshots. At an absolute minimum, several gigabytes
+ of space should be available for use by the Image Service in a
+ proof of concept deployment. To see requirements for other back
+ ends, see Configuration
+ Reference.
+
+
+
+
diff --git a/doc/install-guide/section_nova-controller.xml b/doc/install-guide/section_nova-controller.xml
index 78cd8b66f4..3bb1a21960 100644
--- a/doc/install-guide/section_nova-controller.xml
+++ b/doc/install-guide/section_nova-controller.xml
@@ -74,6 +74,32 @@ rabbit_password = RABBIT_PASS#openstack-config --set /etc/nova/nova.conf DEFAULT rabbit_host controller#openstack-config --set /etc/nova/nova.conf DEFAULT rabbit_password RABBIT_PASS
+
+ Set the ,
+ , and
+
+ configuration options to the internal IP address of the
+ controller node:
+ #openstack-config --set /etc/nova/nova.conf DEFAULT my_ip 192.168.0.10
+#openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_listen 192.168.0.10
+#openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_proxyclient_address 192.168.0.10
+ Edit the
+ /etc/nova/nova.conf file and add these
+ lines to the [DEFAULT] section:
+ In Debian, the debconf
+ package automatically sets up my_ip
+ parameter but you must edit the
+ /etc/nova/nova.conf file to configure
+ the and
+ options,
+ which appear at the end of the file:
+ ...
+[DEFAULT]
+...
+my_ip = 192.168.0.10
+vncserver_listen = 192.168.0.10
+vncserver_proxyclient_address = 192.168.0.10
+ Run the openstack-db command to create
@@ -101,32 +127,6 @@ IDENTIFIED BY 'NOVA_DBPASS';
Create the Compute service tables:#nova-manage db sync
-
- Set the ,
- , and
-
- configuration options to the internal IP address of the
- controller node:
- #openstack-config --set /etc/nova/nova.conf DEFAULT my_ip 192.168.0.10
-#openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_listen 192.168.0.10
-#openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_proxyclient_address 192.168.0.10
- Edit the
- /etc/nova/nova.conf file and add these
- lines to the [DEFAULT] section:
- In Debian, the debconf
- package automatically sets up my_ip
- parameter but you must edit the
- /etc/nova/nova.conf file to configure
- the and
- options,
- which appear at the end of the file:
- ...
-[DEFAULT]
-...
-my_ip=192.168.0.10
-vncserver_listen=192.168.0.10
-vncserver_proxyclient_address=192.168.0.10
- Create a nova user that Compute uses to
authenticate with the Identity Service. Use the