Merge "Update some links to the new docs locations."

This commit is contained in:
Jenkins 2017-07-06 22:11:26 +00:00 committed by Gerrit Code Review
commit 079990fe8c
6 changed files with 11 additions and 11 deletions

View File

@ -17,7 +17,7 @@ Octavia
Octavia is an operator-grade open source scalable load balancer for use in Octavia is an operator-grade open source scalable load balancer for use in
large OpenStack deployments. It delivers load balancing services on `amphorae large OpenStack deployments. It delivers load balancing services on `amphorae
<https://docs.openstack.org/developer/octavia/main/glossary.html>`_ and <https://docs.openstack.org/octavia/latest/reference/glossary.html>`_ and
provides centralized command and control. Octavia is currently the reference provides centralized command and control. Octavia is currently the reference
backend for Neutron LBaaS. In the near future, Octavia is likely to become the backend for Neutron LBaaS. In the near future, Octavia is likely to become the
standard OpenStack LBaaS API endpoint. standard OpenStack LBaaS API endpoint.
@ -30,7 +30,7 @@ Project resources
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
Developer documentation for the Octavia project is available at Developer documentation for the Octavia project is available at
https://docs.openstack.org/developer/octavia https://docs.openstack.org/octavia/latest/
The project source code repository is located at The project source code repository is located at
https://git.openstack.org/cgit/openstack/octavia https://git.openstack.org/cgit/openstack/octavia

View File

@ -195,7 +195,7 @@ default_pool_id-optional:
default_tls_container_ref: default_tls_container_ref:
description: | description: |
The URI to the `key manager service The URI to the `key manager service
<https://docs.openstack.org/developer/barbican/>`__ secrets container <https://docs.openstack.org/barbican/latest/>`__ secrets container
containing the certificate and key for ``TERMINATED_TLS`` listeners. containing the certificate and key for ``TERMINATED_TLS`` listeners.
in: body in: body
required: true required: true
@ -203,7 +203,7 @@ default_tls_container_ref:
default_tls_container_ref-optional: default_tls_container_ref-optional:
description: | description: |
The URI to the `key manager service The URI to the `key manager service
<https://docs.openstack.org/developer/barbican/>`__ secrets container <https://docs.openstack.org/barbican/latest/>`__ secrets container
containing the certificate and key for ``TERMINATED_TLS`` listeners. containing the certificate and key for ``TERMINATED_TLS`` listeners.
in: body in: body
required: false required: false
@ -906,7 +906,7 @@ session_persistence_type:
sni_container_refs: sni_container_refs:
description: | description: |
A list of URIs to the `key manager service A list of URIs to the `key manager service
<https://docs.openstack.org/developer/barbican/>`__ secrets containers <https://docs.openstack.org/barbican/latest/>`__ secrets containers
containing the certificates and keys for ``TERMINATED_TLS`` the listener containing the certificates and keys for ``TERMINATED_TLS`` the listener
using Server Name Indication. using Server Name Indication.
in: body in: body
@ -915,7 +915,7 @@ sni_container_refs:
sni_container_refs-optional: sni_container_refs-optional:
description: | description: |
A list of URIs to the `key manager service A list of URIs to the `key manager service
<https://docs.openstack.org/developer/barbican/>`__ secrets containers <https://docs.openstack.org/barbican/latest/>`__ secrets containers
containing the certificates and keys for ``TERMINATED_TLS`` the listener containing the certificates and keys for ``TERMINATED_TLS`` the listener
using Server Name Indication. using Server Name Indication.
in: body in: body

View File

@ -8,7 +8,7 @@ Service Endpoints
All API calls described throughout the rest of this document require All API calls described throughout the rest of this document require
authentication with the `OpenStack Identity service authentication with the `OpenStack Identity service
<http://docs.openstack.org/developer/keystone/>`_. After authentication, the <https://docs.openstack.org/keystone/latest/>`_. After authentication, the
base ``endpoint URL`` for the ``service type`` of ``load-balancer`` and base ``endpoint URL`` for the ``service type`` of ``load-balancer`` and
``service name`` of ``octavia`` can be extracted from the service catalog ``service name`` of ``octavia`` can be extracted from the service catalog
returned with the identity token. returned with the identity token.
@ -79,7 +79,7 @@ Authentication and authorization
================================ ================================
The Octavia API v2.0 uses the `OpenStack Identity service The Octavia API v2.0 uses the `OpenStack Identity service
<http://docs.openstack.org/developer/keystone/>`_ as the default authentication <https://docs.openstack.org/keystone/latest/>`_ as the default authentication
service. When Keystone is enabled, users that submit requests to the Octavia service. When Keystone is enabled, users that submit requests to the Octavia
service must provide an authentication token in **X-Auth-Token** request service must provide an authentication token in **X-Auth-Token** request
header. You obtain the token by authenticating to the Keystone endpoint. header. You obtain the token by authenticating to the Keystone endpoint.

View File

@ -6,7 +6,7 @@ features:
able to access the Octavia v2 API. This can be overriden with the able to access the Octavia v2 API. This can be overriden with the
admin_or_owner-policy.json sample file provided. admin_or_owner-policy.json sample file provided.
See the `Octavia Policies See the `Octavia Policies
<https://docs.openstack.org/developer/octavia/main/policy.html>`_ <https://docs.openstack.org/octavia/latest/configuration/policy.html>`_
document for more information. document for more information.
security: security:
- | - |

View File

@ -5,7 +5,7 @@ description-file =
README.rst README.rst
author = OpenStack author = OpenStack
author-email = openstack-dev@lists.openstack.org author-email = openstack-dev@lists.openstack.org
home-page = http://docs.openstack.org/developer/octavia/ home-page = https://docs.openstack.org/octavia/latest/
classifier = classifier =
Development Status :: 5 - Production/Stable Development Status :: 5 - Production/Stable
Environment :: OpenStack Environment :: OpenStack

View File

@ -164,4 +164,4 @@ Changes shall be introduced to the octavia APIs: see [1]
References References
========== ==========
[1] http://docs.openstack.org/developer/octavia/api/octaviaapi.html [1] https://developer.openstack.org/api-ref/load-balancer/v1/octaviaapi.html