diff --git a/doc/source/install-guide-revised-draft/configure-aodh.rst b/doc/source/developer-docs/configure-aodh.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-aodh.rst
rename to doc/source/developer-docs/configure-aodh.rst
diff --git a/doc/source/install-guide-revised-draft/configure-ceilometer.rst b/doc/source/developer-docs/configure-ceilometer.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-ceilometer.rst
rename to doc/source/developer-docs/configure-ceilometer.rst
diff --git a/doc/source/install-guide-revised-draft/configure-ceph.rst b/doc/source/developer-docs/configure-ceph.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-ceph.rst
rename to doc/source/developer-docs/configure-ceph.rst
diff --git a/doc/source/install-guide-revised-draft/configure-cinder.rst b/doc/source/developer-docs/configure-cinder.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-cinder.rst
rename to doc/source/developer-docs/configure-cinder.rst
diff --git a/doc/source/install-guide-revised-draft/configure-federation-idp-adfs.rst b/doc/source/developer-docs/configure-federation-idp-adfs.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-federation-idp-adfs.rst
rename to doc/source/developer-docs/configure-federation-idp-adfs.rst
diff --git a/doc/source/install-guide-revised-draft/configure-federation-idp.rst b/doc/source/developer-docs/configure-federation-idp.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-federation-idp.rst
rename to doc/source/developer-docs/configure-federation-idp.rst
diff --git a/doc/source/install-guide-revised-draft/configure-federation-mapping.rst b/doc/source/developer-docs/configure-federation-mapping.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-federation-mapping.rst
rename to doc/source/developer-docs/configure-federation-mapping.rst
diff --git a/doc/source/install-guide-revised-draft/configure-federation-sp-overview.rst b/doc/source/developer-docs/configure-federation-sp-overview.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-federation-sp-overview.rst
rename to doc/source/developer-docs/configure-federation-sp-overview.rst
diff --git a/doc/source/install-guide-revised-draft/configure-federation-sp.rst b/doc/source/developer-docs/configure-federation-sp.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-federation-sp.rst
rename to doc/source/developer-docs/configure-federation-sp.rst
diff --git a/doc/source/install-guide-revised-draft/configure-federation-use-case.rst b/doc/source/developer-docs/configure-federation-use-case.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-federation-use-case.rst
rename to doc/source/developer-docs/configure-federation-use-case.rst
diff --git a/doc/source/install-guide-revised-draft/configure-federation-wrapper.rst b/doc/source/developer-docs/configure-federation-wrapper.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-federation-wrapper.rst
rename to doc/source/developer-docs/configure-federation-wrapper.rst
diff --git a/doc/source/install-guide-revised-draft/configure-federation.rst b/doc/source/developer-docs/configure-federation.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-federation.rst
rename to doc/source/developer-docs/configure-federation.rst
diff --git a/doc/source/install-guide-revised-draft/configure-haproxy.rst b/doc/source/developer-docs/configure-haproxy.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-haproxy.rst
rename to doc/source/developer-docs/configure-haproxy.rst
diff --git a/doc/source/install-guide-revised-draft/configure-horizon.rst b/doc/source/developer-docs/configure-horizon.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-horizon.rst
rename to doc/source/developer-docs/configure-horizon.rst
diff --git a/doc/source/install-guide-revised-draft/configure-hypervisor.rst b/doc/source/developer-docs/configure-hypervisor.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-hypervisor.rst
rename to doc/source/developer-docs/configure-hypervisor.rst
diff --git a/doc/source/install-guide-revised-draft/configure-ironic.rst b/doc/source/developer-docs/configure-ironic.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-ironic.rst
rename to doc/source/developer-docs/configure-ironic.rst
diff --git a/doc/source/install-guide/configure-keystone.rst b/doc/source/developer-docs/configure-keystone.rst
similarity index 100%
rename from doc/source/install-guide/configure-keystone.rst
rename to doc/source/developer-docs/configure-keystone.rst
diff --git a/doc/source/install-guide-revised-draft/configure-network-services.rst b/doc/source/developer-docs/configure-network-services.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-network-services.rst
rename to doc/source/developer-docs/configure-network-services.rst
diff --git a/doc/source/install-guide-revised-draft/configure-nova.rst b/doc/source/developer-docs/configure-nova.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-nova.rst
rename to doc/source/developer-docs/configure-nova.rst
diff --git a/doc/source/install-guide-revised-draft/configure-rabbitmq.rst b/doc/source/developer-docs/configure-rabbitmq.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-rabbitmq.rst
rename to doc/source/developer-docs/configure-rabbitmq.rst
diff --git a/doc/source/install-guide-revised-draft/configure-swift-add.rst b/doc/source/developer-docs/configure-swift-add.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-swift-add.rst
rename to doc/source/developer-docs/configure-swift-add.rst
diff --git a/doc/source/install-guide-revised-draft/configure-swift-config.rst b/doc/source/developer-docs/configure-swift-config.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-swift-config.rst
rename to doc/source/developer-docs/configure-swift-config.rst
diff --git a/doc/source/install-guide-revised-draft/configure-swift-devices.rst b/doc/source/developer-docs/configure-swift-devices.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-swift-devices.rst
rename to doc/source/developer-docs/configure-swift-devices.rst
diff --git a/doc/source/install-guide-revised-draft/configure-swift-glance.rst b/doc/source/developer-docs/configure-swift-glance.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-swift-glance.rst
rename to doc/source/developer-docs/configure-swift-glance.rst
diff --git a/doc/source/install-guide-revised-draft/configure-swift-policies.rst b/doc/source/developer-docs/configure-swift-policies.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-swift-policies.rst
rename to doc/source/developer-docs/configure-swift-policies.rst
diff --git a/doc/source/install-guide-revised-draft/configure-swift.rst b/doc/source/developer-docs/configure-swift.rst
similarity index 100%
rename from doc/source/install-guide-revised-draft/configure-swift.rst
rename to doc/source/developer-docs/configure-swift.rst
diff --git a/doc/source/developer-docs/deploy-config.rst b/doc/source/developer-docs/deploy-config.rst
new file mode 100644
index 0000000000..afda3be9de
--- /dev/null
+++ b/doc/source/developer-docs/deploy-config.rst
@@ -0,0 +1,26 @@
+================================
+Deployment configuration options
+================================
+
+Ansible references a handful of files containing mandatory and optional
+configuration directives. This chapter describes optional configuration
+options to define the target environment before running the Ansible playbooks. 
+
+Contents:
+
+.. toctree::
+
+   configure-hypervisor.rst
+   configure-nova.rst
+   configure-ironic.rst
+   configure-cinder.rst
+   configure-swift.rst
+   configure-haproxy.rst
+   configure-horizon.rst
+   configure-rabbitmq.rst
+   configure-ceilometer.rst
+   configure-aodh.rst
+   configure-keystone.rst
+   configure-network-services.rst
+   configure-federation.rst
+   configure-ceph.rst
diff --git a/doc/source/developer-docs/index.rst b/doc/source/developer-docs/index.rst
index 9387bc7090..8d26075299 100644
--- a/doc/source/developer-docs/index.rst
+++ b/doc/source/developer-docs/index.rst
@@ -17,4 +17,5 @@ Contents:
    core-reviewers
    additional-roles
    inventory
+   deploy-config
 
diff --git a/doc/source/install-guide-revised-draft/configure.rst b/doc/source/install-guide-revised-draft/configure.rst
index 85f9bb6281..9fbd8dbfce 100644
--- a/doc/source/install-guide-revised-draft/configure.rst
+++ b/doc/source/install-guide-revised-draft/configure.rst
@@ -9,24 +9,10 @@ Chapter 4. Deployment configuration
    configure-networking.rst
    configure-hostlist.rst
    configure-creds.rst
-   configure-hypervisor.rst
-   configure-nova.rst
-   configure-ironic.rst
    configure-glance.rst
-   configure-cinder.rst
-   configure-swift.rst
-   configure-haproxy.rst
-   configure-horizon.rst
-   configure-rabbitmq.rst
-   configure-ceilometer.rst
-   configure-aodh.rst
-   configure-keystone.rst
-   configure-network-services.rst
    configure-openstack.rst
    configure-sslcertificates.rst
    configure-configurationintegrity.rst
-   configure-federation.rst
-   configure-ceph.rst
 
 
 **Figure 4.1. Installation work flow**