openstack/openstack-manuals
Code Issues Proposed changes

Merge "[Config Ref] Update links for Ocata"

Browse Source
This commit is contained in:
Jenkins 2017-02-20 04:31:01 +00:00 committed by Gerrit Code Review
commit a4f72f7012
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/config-reference/source/identity.rst
View File

@ -15,9 +15,10 @@ Identity service
This chapter details the Identity service configuration options. For
installation prerequisites and step-by-step walkthroughs, see the
`Newton Installation Tutorials and Guides
<https://docs.openstack.org/project-install-guide/newton/>`_ for your distribution and
`OpenStack Administrator Guide <https://docs.openstack.org/admin-guide/>`_.
`Ocata Installation Tutorials and Guides
<https://docs.openstack.org/project-install-guide/ocata/>`_ for your
distribution and `OpenStack Administrator Guide
<https://docs.openstack.org/admin-guide/>`_.
.. note::

3
doc/config-reference/source/identity/federated-identity.rst
View File

@ -27,7 +27,8 @@ There is currently support for two major federation protocols:
To enable federation:
#. Run keystone under Apache. See `Configure the Apache HTTP server <https://docs.openstack.org/newton/install-guide-obs/keystone-install.html>`_
#. Run keystone under Apache. See `Configure the Apache HTTP server
<https://docs.openstack.org/ocata/install-guide-obs/keystone-install.html>`_
for more information.
.. note::

5
doc/config-reference/source/orchestration.rst
View File

@ -16,8 +16,9 @@ The Orchestration service is designed to manage the lifecycle of infrastructure
and applications within OpenStack clouds. Its various agents and services are
configured in the ``/etc/heat/heat.conf`` file.
To install Orchestration, see the `Newton Installation Tutorials and Guides
<https://docs.openstack.org/project-install-guide/newton/>`_ for your distribution.
To install Orchestration, see the `Ocata Installation Tutorials and Guides
<https://docs.openstack.org/project-install-guide/ocata/>`_ for your
distribution.
.. note::

4
doc/config-reference/source/telemetry.rst
View File

@ -16,8 +16,8 @@ The Telemetry service collects measurements within OpenStack. Its
various agents and services are configured in the
``/etc/ceilometer/ceilometer.conf`` file.
To install Telemetry, see the `Newton Installation Tutorials and Guides
<https://docs.openstack.org/project-install-guide/newton/>`_ for your distribution.
To install Telemetry, see the `Ocata Installation Tutorials and Guides
<https://docs.openstack.org/project-install-guide/ocata/>`_ for your distribution.
.. note::