diff --git a/deploy-guide/source/app-advanced-config-options.rst b/deploy-guide/source/app-advanced-config-options.rst index d9caf1db09..f5232cb01a 100644 --- a/deploy-guide/source/app-advanced-config-options.rst +++ b/deploy-guide/source/app-advanced-config-options.rst @@ -1,6 +1,6 @@ -=================================== +================================== Appendix G: Advanced configuration -=================================== +================================== .. TODO: include intro on what advanced configuration is, whether it’s required or optional, and when someone should do it diff --git a/deploy-guide/source/app-advanced-config-override.rst b/deploy-guide/source/app-advanced-config-override.rst index e1658f0cd6..09d9dcac92 100644 --- a/deploy-guide/source/app-advanced-config-override.rst +++ b/deploy-guide/source/app-advanced-config-override.rst @@ -131,7 +131,7 @@ overrides, the general format for the variable name is ``_policy_overrides``. Overriding .yml files -~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~ You can override ``.yml`` file values by supplying replacement YAML content. diff --git a/deploy-guide/source/app-config-prod.rst b/deploy-guide/source/app-config-prod.rst index a60059a53b..5eb105102f 100644 --- a/deploy-guide/source/app-config-prod.rst +++ b/deploy-guide/source/app-config-prod.rst @@ -87,7 +87,7 @@ following is the ``/etc/network/interfaces`` file for ``infra1``. .. literalinclude:: ../../etc/network/interfaces.d/openstack_interface.cfg.prod.example Deployment configuration -~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~ Environment layout ------------------ diff --git a/deploy-guide/source/app-config-test.rst b/deploy-guide/source/app-config-test.rst index 09b55454db..fd7124aaa7 100644 --- a/deploy-guide/source/app-config-test.rst +++ b/deploy-guide/source/app-config-test.rst @@ -74,7 +74,7 @@ following is the ``/etc/network/interfaces`` file for ``infra1``. .. literalinclude:: ../../etc/network/interfaces.d/openstack_interface.cfg.test.example Deployment configuration -~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~ Environment layout ------------------ diff --git a/deploy-guide/source/app-custom-layouts.rst b/deploy-guide/source/app-custom-layouts.rst index 5cb4ba4e92..14b4f7d500 100644 --- a/deploy-guide/source/app-custom-layouts.rst +++ b/deploy-guide/source/app-custom-layouts.rst @@ -1,6 +1,6 @@ -================================================== +================================================ Appendix C: Customizing host and service layouts -================================================== +================================================ The default layout of containers and services in OpenStack-Ansible (OSA) is determined by the ``/etc/openstack_deploy/openstack_user_config.yml`` file and diff --git a/deploy-guide/source/app-resources.rst b/deploy-guide/source/app-resources.rst index 10d35602bc..cc84f1ae5f 100644 --- a/deploy-guide/source/app-resources.rst +++ b/deploy-guide/source/app-resources.rst @@ -1,6 +1,6 @@ -================================= +================================ Appendix I: Additional resources -================================= +================================ Ansible resources: diff --git a/deploy-guide/source/app-security.rst b/deploy-guide/source/app-security.rst index fc12eea081..3f6b398f20 100644 --- a/deploy-guide/source/app-security.rst +++ b/deploy-guide/source/app-security.rst @@ -1,6 +1,6 @@ -===================== +==================== Appendix D: Security -===================== +==================== Security is one of the top priorities within OpenStack-Ansible (OSA), and many security enhancements for OpenStack clouds are available in deployments by diff --git a/deploy-guide/source/configure.rst b/deploy-guide/source/configure.rst index f36ad3bb0c..c38675aad2 100644 --- a/deploy-guide/source/configure.rst +++ b/deploy-guide/source/configure.rst @@ -58,7 +58,7 @@ configuration, see `developer-inventory `_. Installing additional services -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ To install additional services, the files in ``/etc/openstack_deploy/conf.d`` provide examples showing @@ -172,10 +172,10 @@ password for both the OpenStack API and Dashboard access. We recommend that you use the ``pw-token-gen.py`` script to generate random values for the variables in each file that contains service credentials: - .. code-block:: shell-session +.. code-block:: shell-session - # cd /opt/openstack-ansible/scripts - # python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml + # 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. diff --git a/deploy-guide/source/deploymenthost.rst b/deploy-guide/source/deploymenthost.rst index 9e78caf7e9..9cb472f477 100644 --- a/deploy-guide/source/deploymenthost.rst +++ b/deploy-guide/source/deploymenthost.rst @@ -68,9 +68,9 @@ Before you begin, we recommend upgrading your system packages and kernel. #. Upgrade the system packages and kernel - .. code-block:: shell-session + .. code-block:: shell-session - # yum upgrade + # yum upgrade #. Reboot the host. @@ -118,7 +118,7 @@ Install the source and dependencies for the deployment host. .. parsed-literal:: - # git clone -b |latest_tag| https://git.openstack.org/openstack/openstack-ansible \ + # git clone -b |latest_tag| https://git.openstack.org/openstack/openstack-ansible \\ /opt/openstack-ansible #. Change to the ``/opt/openstack-ansible`` directory, and run the diff --git a/deploy-guide/source/overview-requirements.rst b/deploy-guide/source/overview-requirements.rst index 22b465d29e..95e6ae551b 100644 --- a/deploy-guide/source/overview-requirements.rst +++ b/deploy-guide/source/overview-requirements.rst @@ -13,15 +13,15 @@ following minimum requirements: * Ubuntu - * Ubuntu 16.04 LTS (Xenial Xerus) + * Ubuntu 16.04 LTS (Xenial Xerus) - * Linux kernel version ``3.13.0-34-generic`` or later is required. + * Linux kernel version ``3.13.0-34-generic`` or later is required. * CentOS (support is experimental) - * Centos 7, fully updated. + * Centos 7, fully updated. - * Linux kernel verison ``3.10.0`` or later. + * Linux kernel verison ``3.10.0`` or later. * Secure Shell (SSH) client and server that support public key authentication