Merge "[docs] Update doc references for Ocata/Pike"

README.rst

@@ -48,7 +48,7 @@ http://git.openstack.org/cgit/openstack/openstack-ansible-<ROLENAME>.
 
 .. _official OpenStack project: http://governance.openstack.org/reference/projects/index.html
 .. _Home Page: http://governance.openstack.org/reference/projects/openstackansible.html
-.. _Deployment Guide: https://docs.openstack.org/project-deploy-guide/openstack-ansible/ocata/
+.. _Deployment Guide: https://docs.openstack.org/project-deploy-guide/openstack-ansible
 .. _Quick Start: http://docs.openstack.org/developer/openstack-ansible/developer-docs/quickstart-aio.html
 .. _Developer Documentation: http://docs.openstack.org/developer/openstack-ansible/developer-docs/index.html
 .. _Source: http://git.openstack.org/cgit/openstack/openstack-ansible

deploy-guide/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='newton'
-current_release_branch_name='ocata'
+previous_release_branch_name='ocata'
+current_release_branch_name='pike'
 # Var specifically for using in URLs; differs because it might be 'draft'
 # on master for deploy guide
 deploy_branch_link_name = current_release_branch_name

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='newton'
-current_release_branch_name='ocata'
+previous_release_branch_name='ocata'
+current_release_branch_name='pike'
 # Var specifically for using in URLs; differs because it might be 'draft'
 # on master for deploy guide
 deploy_branch_link_name = current_release_branch_name

doc/source/developer-docs/additional-roles.rst

@@ -97,7 +97,8 @@ Deploying the Role
       modifications being sure that group labels in ``env.d`` and ``conf.d``
       files are consistent.
 
-#. Generate secrets, if any, as described in the `Deployment Guide <http://docs.openstack.org/project-deploy-guide/openstack-ansible/newton/configure.html#configuring-service-credentials>`_.
+#. Generate secrets, if any, as described in the :deploy_guide:`Configure
+   Service Credentials <configure.html#configuring-service-credentials>`.
    You can append your keys to an existing ``user_secrets.yml`` file or add a
    new file to the ``openstack_deploy`` directory to contain them. Provide
    overrides for any other variables you will need at this time as well, either

doc/source/developer-docs/contribute.rst

@@ -195,7 +195,7 @@ OpenStack-Ansible has multiple forms of documentation with different intent.
    statements of intent. The work to fulfill the intent is ongoing. Any new
    documentation submissions should try to help this intent where possible.
 
-The `Deployment Guide <http://docs.openstack.org/project-deploy-guide/openstack-ansible/newton/>`_
+The `Deployment Guide <http://docs.openstack.org/project-deploy-guide/openstack-ansible>`_
 intends to help deployers deploy OpenStack-Ansible for the first time.
 
 The role documentation (for example, the `keystone role documentation`_)

doc/source/draft-operations-guide/advanced-config.rst

@@ -112,7 +112,8 @@ deployed environment, allowing a deployer to define additional group mappings.
 This directory is used to extend the environment skeleton, or modify the
 defaults defined in the ``playbooks/inventory/env.d`` directory.
 
-See also `Understanding Container Groups <http://docs.openstack.org/project-deploy-guide/openstack-ansible/newton/app-custom-layouts.html>`_
+See also
+:deploy_guide:`Understanding Container Groups <app-custom-layouts.html>`
 in Appendix C of the Deployment Guide.
 
 conf.d
@@ -125,7 +126,7 @@ OpenStack-Ansible in the
 Additional services should be defined with a YAML file in
 ``/etc/openstack_deploy/conf.d``, in order to manage file size.
 
-See also `Understanding Host Groups <http://docs.openstack.org/project-deploy-guide/openstack-ansible/newton/app-custom-layouts.html>`_
+See also :deploy_guide:`Understanding Host Groups <app-custom-layouts.html>`
 in Appendix C of the Deployment Guide.
 
 user_*.yml files
@@ -175,7 +176,7 @@ functionality where applicable. Files available to receive overrides can be
 seen in the ``defaults/main.yml`` file as standard empty dictionaries (hashes).
 
 Practical guidance for using this feature is available in the
-`Deployment Guide <http://docs.openstack.org/project-deploy-guide/openstack-ansible/newton/app-advanced-config-override.html>`_.
+:deploy_guide:`Deployment Guide <app-advanced-config-override.html>`.
 
 This module has been `submitted for consideration`_ into Ansible Core.
 

doc/source/index.rst

@@ -25,14 +25,14 @@ OpenStack-Ansible Pike is currently in development.
    developer-docs/index
    inventory/index
 
-.. _Deployment Guide: http://docs.openstack.org/project-deploy-guide/draft/
+.. _Deployment Guide: http://docs.openstack.org/project-deploy-guide/openstack-ansible/draft/
 .. _Release Notes: http://docs.openstack.org/releasenotes/openstack-ansible/unreleased.html
 
 Ocata: Release Candidate
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-OpenStack-Ansible's Ocata series is scheduled to be released with the 15.0.0
-tag by 10 Mar 2017.
+OpenStack-Ansible's Ocata series was first released with the 15.0.0 tag on
+8 March 2017.
 
 * `OpenStack-Ansible Ocata Documentation`_
 

doc/source/upgrade-guide/overview.rst

@@ -27,4 +27,4 @@ major upgrade process performs the following actions:
 - Upgrades the RabbitMQ server. See :ref:`setup-infra-playbook` for details.
 
 For more information about the major upgrade process, see
-:ref:`` and :ref:`Upgrading-manually`.
+:ref:`upgrading-by-using-a-script` and :ref:`upgrading-manually`.

doc/source/upgrade-guide/script-upgrade.rst

@@ -1,4 +1,4 @@
-.. _Upgrading-by-using-a-script:
+.. _upgrading-by-using-a-script:
 
 ===========================
 Upgrading by using a script