From 2e355b3e637939f0852aa0db262ab7711db2f446 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 2 Sep 2016 11:47:00 +0100 Subject: [PATCH] [DOCS] Rename upgrade documentation to upgrade guide Updates navigation and fixes minor errors Change-Id: I16899f3b9d2a9ac0f123f862dc7f9f2a6ac5c559 --- doc/source/upgrade-guide/index.rst | 8 +++----- doc/source/upgrade-guide/manual-upgrade.rst | 4 ---- doc/source/upgrade-guide/minor-upgrade.rst | 6 ------ doc/source/upgrade-guide/overview.rst | 3 --- doc/source/upgrade-guide/reference-scripts.rst | 5 +---- doc/source/upgrade-guide/reference-upgrade-playbooks.rst | 5 ----- doc/source/upgrade-guide/script-upgrade.rst | 3 --- 7 files changed, 4 insertions(+), 30 deletions(-) diff --git a/doc/source/upgrade-guide/index.rst b/doc/source/upgrade-guide/index.rst index f5c7bb5720..4dc739cc88 100644 --- a/doc/source/upgrade-guide/index.rst +++ b/doc/source/upgrade-guide/index.rst @@ -1,12 +1,10 @@ -===================== -Upgrade Documentation -===================== +============= +Upgrade Guide +============= In this section you can find information on the Mitaka to Newton upgrade process for OpenStack-Ansible. -Table of Contents: - .. toctree:: :maxdepth: 2 diff --git a/doc/source/upgrade-guide/manual-upgrade.rst b/doc/source/upgrade-guide/manual-upgrade.rst index 92c3e8c669..10c7daa6d9 100644 --- a/doc/source/upgrade-guide/manual-upgrade.rst +++ b/doc/source/upgrade-guide/manual-upgrade.rst @@ -223,7 +223,3 @@ without any additional options. .. code-block:: console # openstack-ansible setup-openstack.yml - --------------- - -.. include:: navigation.txt diff --git a/doc/source/upgrade-guide/minor-upgrade.rst b/doc/source/upgrade-guide/minor-upgrade.rst index 2bde50dff1..9faf54c426 100644 --- a/doc/source/upgrade-guide/minor-upgrade.rst +++ b/doc/source/upgrade-guide/minor-upgrade.rst @@ -1,5 +1,3 @@ -`Home `__ OpenStack-Ansible Installation Guide - .. _minor-upgrades: ============== @@ -130,7 +128,3 @@ tasks will execute. # openstack-ansible os-nova-install.yml --limit nova_compute \ --skip-tags 'nova-key' \ --list-tasks - --------------- - -.. include:: navigation.txt diff --git a/doc/source/upgrade-guide/overview.rst b/doc/source/upgrade-guide/overview.rst index 05d176ef33..6ad5ca8377 100644 --- a/doc/source/upgrade-guide/overview.rst +++ b/doc/source/upgrade-guide/overview.rst @@ -30,6 +30,3 @@ and :ref:`manual-upgrade`. .. note:: You can only upgrade between sequential releases. --------------- - -.. include:: navigation.txt diff --git a/doc/source/upgrade-guide/reference-scripts.rst b/doc/source/upgrade-guide/reference-scripts.rst index e7d2303e8a..2d0fdb78ed 100644 --- a/doc/source/upgrade-guide/reference-scripts.rst +++ b/doc/source/upgrade-guide/reference-scripts.rst @@ -1,3 +1,4 @@ +======= Scripts ======= @@ -42,7 +43,3 @@ indicates to OpenStack-Ansible to skip this step on successive runs. The script itself does not check for this file. Called by :ref:`config-change-playbook` - --------------- - -.. include:: navigation.txt diff --git a/doc/source/upgrade-guide/reference-upgrade-playbooks.rst b/doc/source/upgrade-guide/reference-upgrade-playbooks.rst index 01d3e7ec73..01f5133934 100644 --- a/doc/source/upgrade-guide/reference-upgrade-playbooks.rst +++ b/doc/source/upgrade-guide/reference-upgrade-playbooks.rst @@ -121,8 +121,3 @@ Stops the ``aodh-api`` service and removes the init file since ``aodh-api`` now runs under Apache ``mod_wsgi``. Run the ``os-aodh-install.yml`` playbook during the OpenStack services upgrade to ensure ``aodh-api`` is available after running ``aodh-api-init-delete.yml``. - - --------------- - -.. include:: navigation.txt diff --git a/doc/source/upgrade-guide/script-upgrade.rst b/doc/source/upgrade-guide/script-upgrade.rst index 1d3615460b..7dbeb0f896 100644 --- a/doc/source/upgrade-guide/script-upgrade.rst +++ b/doc/source/upgrade-guide/script-upgrade.rst @@ -25,6 +25,3 @@ following steps in the ``openstack-ansible`` directory: # git checkout ${LATEST_TAG} # ./scripts/run-upgrade.sh --------------- - -.. include:: navigation.txt