openstack/openstack-ansible
Code Issues Proposed changes

[docs] Update branch names for Ocata

Browse Source 
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
This commit is contained in:
Jesse Pretorius 2016-11-02 10:00:03 +00:00
parent 2ab8a81cd3
commit 929034d328
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/conf.py
View File

@ -301,8 +301,8 @@ pdf_documents = [
latest_tag = os.popen('git describe --abbrev=0 --tags').read().strip('\n') latest_tag = os.popen('git describe --abbrev=0 --tags').read().strip('\n')
previous_release_branch_name='mitaka' previous_release_branch_name='newton'
current_release_branch_name='newton' current_release_branch_name='ocata'
previous_release_capital_name=previous_release_branch_name.upper() previous_release_capital_name=previous_release_branch_name.upper()
previous_release_formal_name=previous_release_branch_name.capitalize() previous_release_formal_name=previous_release_branch_name.capitalize()

3
doc/source/developer-docs/quickstart-aio.rst
View File

@ -84,7 +84,8 @@ development) build it is usually best to checkout the latest tagged version.
# git checkout |latest_tag| # git checkout |latest_tag|
.. note:: .. 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 By default the scripts deploy all OpenStack services with sensible defaults
for the purpose of a gate check, development or testing system. for the purpose of a gate check, development or testing system.

5
doc/source/install-guide/deploymenthost.rst
View File

@ -88,8 +88,9 @@ Install the source and dependencies for the deployment host.
the ``/opt/openstack-ansible`` directory: the ``/opt/openstack-ansible`` directory:
.. parsed-literal:: .. 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 #. Change to the ``/opt/openstack-ansible`` directory, and run the
Ansible bootstrap script: Ansible bootstrap script: