diff --git a/deploy-guide/source/app-advanced-config-options.rst b/deploy-guide/source/app-advanced-config-options.rst
index b2dbeedb1f..2aaa43bbbb 100644
--- a/deploy-guide/source/app-advanced-config-options.rst
+++ b/deploy-guide/source/app-advanced-config-options.rst
@@ -12,4 +12,3 @@ Appendix F: Advanced configuration
    app-advanced-config-security
    app-advanced-config-sslcertificates
    app-advanced-config-affinity
-   app-advanced-role-docs
diff --git a/deploy-guide/source/app-advanced-role-docs.rst b/deploy-guide/source/app-advanced-role-docs.rst
deleted file mode 100644
index 0c68f5a065..0000000000
--- a/deploy-guide/source/app-advanced-role-docs.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-==============================
-Advanced service configuration
-==============================
-
-OpenStack-Ansible has many options that you can use for the advanced
-configuration of services. Each role's documentation provides information
-about the available options.
-
-You can find the list of advanced service configuration roles OpenStack-Ansible
-supports in the `Developer documentation <http://docs.openstack.org/developer/openstack-ansible/developer-docs/index.html>`_.
-
diff --git a/deploy-guide/source/configure.rst b/deploy-guide/source/configure.rst
index 13bc0e00f3..1cf4161523 100644
--- a/deploy-guide/source/configure.rst
+++ b/deploy-guide/source/configure.rst
@@ -56,7 +56,7 @@ For details about how the inventory is generated from the environment
 configuration, see
 `developer-inventory <http://docs.openstack.org/developer/openstack-ansible/developer-docs/inventory.html>`_.
 
-Configuring additional services
+Installing additional services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To install additional services, the files in
@@ -64,6 +64,126 @@ To install additional services, the files in
 the correct host groups to use. To add another service, add the host group,
 allocate hosts to it, and then execute the playbooks.
 
+Advanced service configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+OpenStack-Ansible has many options that you can use for the advanced
+configuration of services. Each role's documentation provides information
+about the available options.
+
+Infrastructure service roles
+----------------------------
+
+- `galera_server
+  <http://docs.openstack.org/developer/openstack-ansible-galera_server>`_
+
+- `haproxy_server
+  <http://docs.openstack.org/developer/openstack-ansible-haproxy_server>`_
+
+- `memcached_server
+  <http://docs.openstack.org/developer/openstack-ansible-memcached_server>`_
+
+- `rabbitmq_server
+  <http://docs.openstack.org/developer/openstack-ansible-rabbitmq_server>`_
+
+- `repo_build
+  <http://docs.openstack.org/developer/openstack-ansible-repo_build>`_
+
+- `repo_server
+  <http://docs.openstack.org/developer/openstack-ansible-repo_server>`_
+
+- `rsyslog_server
+  <http://docs.openstack.org/developer/openstack-ansible-rsyslog_server>`_
+
+
+OpenStack service roles
+-----------------------
+
+-  `os_aodh <http://docs.openstack.org/developer/openstack-ansible-os_aodh>`_
+
+-  `os_barbican
+   <http://docs.openstack.org/developer/openstack-ansible-os_barbican>`_
+
+-  `os_ceilometer
+   <http://docs.openstack.org/developer/openstack-ansible-os_ceilometer>`_
+
+-  `os_cinder
+   <http://docs.openstack.org/developer/openstack-ansible-os_cinder>`_
+
+-  `os_designate
+   <http://docs.openstack.org/developer/openstack-ansible-os_designate>`_
+
+-  `os_glance
+   <http://docs.openstack.org/developer/openstack-ansible-os_glance>`_
+
+-  `os_gnocchi
+   <http://docs.openstack.org/developer/openstack-ansible-os_gnocchi>`_
+
+-  `os_heat <http://docs.openstack.org/developer/openstack-ansible-os_heat>`_
+
+-  `os_horizon
+   <http://docs.openstack.org/developer/openstack-ansible-os_horizon>`_
+
+-  `os_ironic
+   <http://docs.openstack.org/developer/openstack-ansible-os_ironic>`_
+
+-  `os_keystone
+   <http://docs.openstack.org/developer/openstack-ansible-os_keystone>`_
+
+-  `os_magnum
+   <http://docs.openstack.org/developer/openstack-ansible-os_magnum>`_
+
+-  `os_neutron
+   <http://docs.openstack.org/developer/openstack-ansible-os_neutron>`_
+
+-  `os_nova <http://docs.openstack.org/developer/openstack-ansible-os_nova>`_
+
+-  `os_rally <http://docs.openstack.org/developer/openstack-ansible-os_rally>`_
+
+-  `os_sahara
+   <http://docs.openstack.org/developer/openstack-ansible-os_sahara>`_
+
+-  `os_swift <http://docs.openstack.org/developer/openstack-ansible-os_swift>`_
+
+-  `os_tempest
+   <http://docs.openstack.org/developer/openstack-ansible-os_tempest>`_
+
+-  `os_trove <http://docs.openstack.org/developer/openstack-ansible-os_trove>`_
+
+
+Other roles
+-----------
+
+- `ansible-plugins
+  <http://docs.openstack.org/developer/openstack-ansible-plugins>`_
+
+- `apt_package_pinning
+  <http://docs.openstack.org/developer/openstack-ansible-apt_package_pinning/>`_
+
+- `ceph_client
+  <http://docs.openstack.org/developer/openstack-ansible-ceph_client>`_
+
+- `galera_client
+  <http://docs.openstack.org/developer/openstack-ansible-galera_client>`_
+
+- `lxc_container_create
+  <http://docs.openstack.org/developer/openstack-ansible-lxc_container_create>`_
+
+- `lxc_hosts
+  <http://docs.openstack.org/developer/openstack-ansible-lxc_hosts>`_
+
+- `pip_install
+  <http://docs.openstack.org/developer/openstack-ansible-pip_install/>`_
+
+- `openstack_openrc
+  <http://docs.openstack.org/developer/openstack-ansible-openstack_openrc>`_
+
+- `openstack_hosts
+  <http://docs.openstack.org/developer/openstack-ansible-openstack_hosts>`_
+
+- `rsyslog_client
+  <http://docs.openstack.org/developer/openstack-ansible-rsyslog_client>`_
+
 Configuring service credentials
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/source/developer-docs/advanced-role-docs.rst b/doc/source/developer-docs/advanced-role-docs.rst
deleted file mode 100644
index 7fd55b737d..0000000000
--- a/doc/source/developer-docs/advanced-role-docs.rst
+++ /dev/null
@@ -1,94 +0,0 @@
-.. _role-docs:
-
-==============================
-Advanced service configuration
-==============================
-
-OpenStack-Ansible has many options that you can use for the advanced
-configuration of services. Each role's documentation provides information
-about the available options.
-
-The following options are optional.
-
-Infrastructure service roles
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- `galera_server <http://docs.openstack.org/developer/openstack-ansible-galera_server>`_
-
-- `haproxy_server <http://docs.openstack.org/developer/openstack-ansible-haproxy_server>`_
-
-- `memcached_server <http://docs.openstack.org/developer/openstack-ansible-memcached_server>`_
-
-- `rabbitmq_server <http://docs.openstack.org/developer/openstack-ansible-rabbitmq_server>`_
-
-- `repo_build <http://docs.openstack.org/developer/openstack-ansible-repo_build>`_
-
-- `repo_server <http://docs.openstack.org/developer/openstack-ansible-repo_server>`_
-
-- `rsyslog_server <http://docs.openstack.org/developer/openstack-ansible-rsyslog_server>`_
-
-
-OpenStack service roles
-~~~~~~~~~~~~~~~~~~~~~~~
-
--  `os_aodh <http://docs.openstack.org/developer/openstack-ansible-os_aodh>`_
-
--  `os_barbican <http://docs.openstack.org/developer/openstack-ansible-os_barbican>`_
-
--  `os_ceilometer <http://docs.openstack.org/developer/openstack-ansible-os_ceilometer>`_
-
--  `os_cinder <http://docs.openstack.org/developer/openstack-ansible-os_cinder>`_
-
--  `os_designate <http://docs.openstack.org/developer/openstack-ansible-os_designate>`_
-
--  `os_glance <http://docs.openstack.org/developer/openstack-ansible-os_glance>`_
-
--  `os_gnocchi <http://docs.openstack.org/developer/openstack-ansible-os_gnocchi>`_
-
--  `os_heat <http://docs.openstack.org/developer/openstack-ansible-os_heat>`_
-
--  `os_horizon <http://docs.openstack.org/developer/openstack-ansible-os_horizon>`_
-
--  `os_ironic <http://docs.openstack.org/developer/openstack-ansible-os_ironic>`_
-
--  `os_keystone <http://docs.openstack.org/developer/openstack-ansible-os_keystone>`_
-
--  `os_magnum <http://docs.openstack.org/developer/openstack-ansible-os_magnum>`_
-
--  `os_neutron <http://docs.openstack.org/developer/openstack-ansible-os_neutron>`_
-
--  `os_nova <http://docs.openstack.org/developer/openstack-ansible-os_nova>`_
-
--  `os_rally <http://docs.openstack.org/developer/openstack-ansible-os_rally>`_
-
--  `os_sahara <http://docs.openstack.org/developer/openstack-ansible-os_sahara>`_
-
--  `os_swift <http://docs.openstack.org/developer/openstack-ansible-os_swift>`_
-
--  `os_tempest <http://docs.openstack.org/developer/openstack-ansible-os_tempest>`_
-
--  `os_trove <http://docs.openstack.org/developer/openstack-ansible-os_trove>`_
-
-
-Other roles
-~~~~~~~~~~~
-
-- `ansible-plugins <http://docs.openstack.org/developer/openstack-ansible-plugins>`_
-
-- `apt_package_pinning <http://docs.openstack.org/developer/openstack-ansible-apt_package_pinning/>`_
-
-- `ceph_client <http://docs.openstack.org/developer/openstack-ansible-ceph_client>`_
-
-- `galera_client <http://docs.openstack.org/developer/openstack-ansible-galera_client>`_
-
-- `lxc_container_create <http://docs.openstack.org/developer/openstack-ansible-lxc_container_create>`_
-
-- `lxc_hosts <http://docs.openstack.org/developer/openstack-ansible-lxc_hosts>`_
-
-- `pip_install <http://docs.openstack.org/developer/openstack-ansible-pip_install/>`_
-
-- `openstack_openrc <http://docs.openstack.org/developer/openstack-ansible-openstack_openrc>`_
-
-- `openstack_hosts <http://docs.openstack.org/developer/openstack-ansible-openstack_hosts>`_
-
-- `rsyslog_client <http://docs.openstack.org/developer/openstack-ansible-rsyslog_client>`_
diff --git a/doc/source/developer-docs/role-services.rst b/doc/source/developer-docs/role-services.rst
index fe7c55b4d5..b0f9f59a5a 100644
--- a/doc/source/developer-docs/role-services.rst
+++ b/doc/source/developer-docs/role-services.rst
@@ -11,4 +11,3 @@ in maintaining it.
    :maxdepth: 2
 
    additional-roles
-   advanced-role-docs