From 3007738fec970766a21ab3d4bd708133cfede49d Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Wed, 5 Jul 2017 15:37:06 -0700 Subject: [PATCH] Update some links to the new docs locations. Change-Id: Ic10c2a2d924e5daa5567f33ccb80d6e33949f636 --- README.rst | 4 ++-- api-ref/source/parameters.yaml | 8 ++++---- api-ref/source/v2/general.inc | 4 ++-- releasenotes/notes/octavia_v2_RBAC-0eb2b51aa6278435.yaml | 2 +- setup.cfg | 2 +- specs/version0.9/stats_api.rst | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index 2405f68bfb..5db9e4ee2e 100644 --- a/README.rst +++ b/README.rst @@ -17,7 +17,7 @@ Octavia Octavia is an operator-grade open source scalable load balancer for use in large OpenStack deployments. It delivers load balancing services on `amphorae -`_ and +`_ and provides centralized command and control. Octavia is currently the reference backend for Neutron LBaaS. In the near future, Octavia is likely to become the standard OpenStack LBaaS API endpoint. @@ -30,7 +30,7 @@ Project resources ~~~~~~~~~~~~~~~~~ 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 https://git.openstack.org/cgit/openstack/octavia diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml index ee5cee6067..0569ac8790 100644 --- a/api-ref/source/parameters.yaml +++ b/api-ref/source/parameters.yaml @@ -195,7 +195,7 @@ default_pool_id-optional: default_tls_container_ref: description: | The URI to the `key manager service - `__ secrets container + `__ secrets container containing the certificate and key for ``TERMINATED_TLS`` listeners. in: body required: true @@ -203,7 +203,7 @@ default_tls_container_ref: default_tls_container_ref-optional: description: | The URI to the `key manager service - `__ secrets container + `__ secrets container containing the certificate and key for ``TERMINATED_TLS`` listeners. in: body required: false @@ -906,7 +906,7 @@ session_persistence_type: sni_container_refs: description: | A list of URIs to the `key manager service - `__ secrets containers + `__ secrets containers containing the certificates and keys for ``TERMINATED_TLS`` the listener using Server Name Indication. in: body @@ -915,7 +915,7 @@ sni_container_refs: sni_container_refs-optional: description: | A list of URIs to the `key manager service - `__ secrets containers + `__ secrets containers containing the certificates and keys for ``TERMINATED_TLS`` the listener using Server Name Indication. in: body diff --git a/api-ref/source/v2/general.inc b/api-ref/source/v2/general.inc index fac31e3c27..6f1ebf81d1 100644 --- a/api-ref/source/v2/general.inc +++ b/api-ref/source/v2/general.inc @@ -8,7 +8,7 @@ Service Endpoints All API calls described throughout the rest of this document require authentication with the `OpenStack Identity service -`_. After authentication, the +`_. After authentication, the base ``endpoint URL`` for the ``service type`` of ``load-balancer`` and ``service name`` of ``octavia`` can be extracted from the service catalog returned with the identity token. @@ -79,7 +79,7 @@ Authentication and authorization ================================ The Octavia API v2.0 uses the `OpenStack Identity service -`_ as the default authentication +`_ as the default authentication service. When Keystone is enabled, users that submit requests to the Octavia service must provide an authentication token in **X-Auth-Token** request header. You obtain the token by authenticating to the Keystone endpoint. diff --git a/releasenotes/notes/octavia_v2_RBAC-0eb2b51aa6278435.yaml b/releasenotes/notes/octavia_v2_RBAC-0eb2b51aa6278435.yaml index 7ca52cfec0..1d6d7d69e6 100644 --- a/releasenotes/notes/octavia_v2_RBAC-0eb2b51aa6278435.yaml +++ b/releasenotes/notes/octavia_v2_RBAC-0eb2b51aa6278435.yaml @@ -6,7 +6,7 @@ features: able to access the Octavia v2 API. This can be overriden with the admin_or_owner-policy.json sample file provided. See the `Octavia Policies - `_ + `_ document for more information. security: - | diff --git a/setup.cfg b/setup.cfg index b9d0e54a7a..5b4f1a7d44 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description-file = README.rst author = OpenStack author-email = openstack-dev@lists.openstack.org -home-page = http://docs.openstack.org/developer/octavia/ +home-page = https://docs.openstack.org/octavia/latest/ classifier = Development Status :: 5 - Production/Stable Environment :: OpenStack diff --git a/specs/version0.9/stats_api.rst b/specs/version0.9/stats_api.rst index f02ee104be..36da1c1008 100644 --- a/specs/version0.9/stats_api.rst +++ b/specs/version0.9/stats_api.rst @@ -164,4 +164,4 @@ Changes shall be introduced to the octavia APIs: see [1] References ========== -[1] http://docs.openstack.org/developer/octavia/api/octaviaapi.html +[1] https://developer.openstack.org/api-ref/load-balancer/v1/octaviaapi.html