From 929034d32820e06d0956841cb3c935b5d6b4c938 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 2 Nov 2016 10:00:03 +0000 Subject: [PATCH] [docs] Update branch names for Ocata This patch adjust the branch names for Ocata to ensure that the install guide and upgrade guide references are correct. Also, the word TAG is replaced with the substitution reference to ensure that the latest tag is always shown once the docs move into a stable branch. Finally, the developer note regarding the supported platform for an AIO has been updated to reflect the Newton platform support. Change-Id: I1a8464917343c9533fe5698ab8da18bf1e1529d7 --- doc/source/conf.py | 4 ++-- doc/source/developer-docs/quickstart-aio.rst | 3 ++- doc/source/install-guide/deploymenthost.rst | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index dbbd7f152f..d6e7b671be 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -301,8 +301,8 @@ pdf_documents = [ latest_tag = os.popen('git describe --abbrev=0 --tags').read().strip('\n') -previous_release_branch_name='mitaka' -current_release_branch_name='newton' +previous_release_branch_name='newton' +current_release_branch_name='ocata' previous_release_capital_name=previous_release_branch_name.upper() previous_release_formal_name=previous_release_branch_name.capitalize() diff --git a/doc/source/developer-docs/quickstart-aio.rst b/doc/source/developer-docs/quickstart-aio.rst index 764ba8d1f5..d6ea61c720 100644 --- a/doc/source/developer-docs/quickstart-aio.rst +++ b/doc/source/developer-docs/quickstart-aio.rst @@ -84,7 +84,8 @@ development) build it is usually best to checkout the latest tagged version. # git checkout |latest_tag| .. note:: - The |previous_release_formal_name| release is only compatible with Ubuntu 14.04 (Trusy Tahr). + The |previous_release_formal_name| release is only compatible with Ubuntu + 14.04 (Trusy Tahr) and Ubuntu 16.04 (Xenial Xerus). By default the scripts deploy all OpenStack services with sensible defaults for the purpose of a gate check, development or testing system. diff --git a/doc/source/install-guide/deploymenthost.rst b/doc/source/install-guide/deploymenthost.rst index 84c0b80014..8efb056eae 100644 --- a/doc/source/install-guide/deploymenthost.rst +++ b/doc/source/install-guide/deploymenthost.rst @@ -88,8 +88,9 @@ Install the source and dependencies for the deployment host. the ``/opt/openstack-ansible`` directory: .. parsed-literal:: - # git clone -b TAG https://git.openstack.org/openstack/openstack-ansible - /opt/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 Ansible bootstrap script: