From 968d89335e1b795fef67e100088aa9fc6a625a99 Mon Sep 17 00:00:00 2001
From: Nish Patwa <nish.patwa@intel.com>
Date: Tue, 13 Sep 2016 15:18:29 -0500
Subject: [PATCH] [docs] Merge install guide configure content into a single
 page

Omitted configure-initial.rst and configure-creds.rst
Combined the content of both files to a single configure.rst file.

Change-Id: Ie9247adb87fb421b5010bb0a57bb356dee395de9
Closes-Bug: 1622660
---
 doc/source/install-guide/configure-creds.rst  | 36 ---------
 .../install-guide/configure-initial.rst       | 39 ----------
 doc/source/install-guide/configure.rst        | 73 ++++++++++++++++++-
 3 files changed, 71 insertions(+), 77 deletions(-)
 delete mode 100644 doc/source/install-guide/configure-creds.rst
 delete mode 100644 doc/source/install-guide/configure-initial.rst

diff --git a/doc/source/install-guide/configure-creds.rst b/doc/source/install-guide/configure-creds.rst
deleted file mode 100644
index f385353d0c..0000000000
--- a/doc/source/install-guide/configure-creds.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-===============================
-Configuring service credentials
-===============================
-
-Configure credentials for each service in the
-``/etc/openstack_deploy/*_secrets.yml`` files. Consider using `Ansible
-Vault <http://docs.ansible.com/playbooks_vault.html>`_ to increase
-security by encrypting any files containing credentials.
-
-Adjust permissions on these files to restrict access by non-privileged
-users.
-
-.. note::
-
-   The following options configure passwords for the web interfaces.
-
-* ``keystone_auth_admin_password`` configures the ``admin`` tenant
-   password for both the OpenStack API and dashboard access.
-
-.. note::
-
-   We recommend using the ``pw-token-gen.py`` script to generate random
-   values for the variables in each file that contains service credentials:
-
-   .. code-block:: shell-session
-
-      # cd /opt/openstack-ansible/scripts
-      # python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml
-
-To regenerate existing passwords, add the ``--regen`` flag.
-
-.. warning::
-
-   The playbooks do not currently manage changing passwords in an existing
-   environment. Changing passwords and re-running the playbooks will fail
-   and may break your OpenStack environment.
diff --git a/doc/source/install-guide/configure-initial.rst b/doc/source/install-guide/configure-initial.rst
deleted file mode 100644
index 254f7b23d5..0000000000
--- a/doc/source/install-guide/configure-initial.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-=================================
-Initial environment configuration
-=================================
-
-OpenStack-Ansible depends on various files that are used to build an inventory
-for Ansible. Start by getting those files into the correct places:
-
-#. Copy the contents of the
-   ``/opt/openstack-ansible/etc/openstack_deploy`` directory to the
-   ``/etc/openstack_deploy`` directory.
-
-.. note::
-
-    As of Newton, the ``env.d`` directory has been moved from this source
-    directory to ``playbooks/inventory/``.
-
-#. Change to the ``/etc/openstack_deploy`` directory.
-
-#. Copy the ``openstack_user_config.yml.example`` file to
-   ``/etc/openstack_deploy/openstack_user_config.yml``.
-
-You can review the ``openstack_user_config.yml`` file and make changes
-to the deployment of your OpenStack environment.
-
-.. note::
-
-   The file is heavily commented with details about the various options.
-
-Configuration in ``openstack_user_config.yml`` defines which hosts
-will run the containers and services deployed by OpenStack-Ansible. For
-example, hosts listed in the ``shared-infra_hosts`` run containers for many of
-the shared services that your OpenStack environment requires. Some of these
-services include databases, memcached, and RabbitMQ. There are several other
-host types that contain other types of containers and all of these are listed
-in ``openstack_user_config.yml``.
-
-For details about how the inventory is generated from the environment
-configuration, see :ref:`developer-inventory`.
-
diff --git a/doc/source/install-guide/configure.rst b/doc/source/install-guide/configure.rst
index ceb7c16e6a..e68a9c8354 100644
--- a/doc/source/install-guide/configure.rst
+++ b/doc/source/install-guide/configure.rst
@@ -7,9 +7,7 @@ Configure deployment
 .. toctree::
    :maxdepth: 2
 
-   configure-initial.rst
    configure-user-config-examples.rst
-   configure-creds.rst
 
 .. figure:: figures/installation-workflow-configure-deployment.png
    :width: 100%
@@ -26,3 +24,74 @@ tasks include:
   Networking (neutron).
 * Passwords for all services.
 
+Initial environment configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+OpenStack-Ansible depends on various files that are used to build an inventory
+for Ansible. Start by getting those files into the correct places:
+
+#. Copy the contents of the
+   ``/opt/openstack-ansible/etc/openstack_deploy`` directory to the
+   ``/etc/openstack_deploy`` directory.
+
+.. note::
+
+    As of Newton, the ``env.d`` directory has been moved from this source
+    directory to ``playbooks/inventory/``.
+
+#. Change to the ``/etc/openstack_deploy`` directory.
+
+#. Copy the ``openstack_user_config.yml.example`` file to
+   ``/etc/openstack_deploy/openstack_user_config.yml``.
+
+You can review the ``openstack_user_config.yml`` file and make changes
+to the deployment of your OpenStack environment.
+
+.. note::
+
+   The file is heavily commented with details about the various options.
+
+Configuration in ``openstack_user_config.yml`` defines which hosts
+will run the containers and services deployed by OpenStack-Ansible. For
+example, hosts listed in the ``shared-infra_hosts`` run containers for many of
+the shared services that your OpenStack environment requires. Some of these
+services include databases, memcached, and RabbitMQ. There are several other
+host types that contain other types of containers and all of these are listed
+in ``openstack_user_config.yml``.
+
+For details about how the inventory is generated from the environment
+configuration, see :ref:`developer-inventory`.
+
+Configuring service credentials
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Configure credentials for each service in the
+``/etc/openstack_deploy/*_secrets.yml`` files. Consider using `Ansible
+Vault <http://docs.ansible.com/playbooks_vault.html>`_ to increase
+security by encrypting any files containing credentials.
+
+Adjust permissions on these files to restrict access by non-privileged
+users.
+
+.. note::
+
+   The following options configure passwords for the web interfaces.
+
+* ``keystone_auth_admin_password`` configures the ``admin`` tenant
+   password for both the OpenStack API and dashboard access.
+
+.. note::
+
+   We recommend using the ``pw-token-gen.py`` script to generate random
+   values for the variables in each file that contains service credentials:
+
+   .. code-block:: shell-session
+
+      # cd /opt/openstack-ansible/scripts
+      # python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml
+
+To regenerate existing passwords, add the ``--regen`` flag.
+
+.. warning::
+
+   The playbooks do not currently manage changing passwords in an existing
+   environment. Changing passwords and re-running the playbooks will fail
+   and may break your OpenStack environment.