From 7abe1c0f3addd9315b263c59aa606fc5225bca86 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Mon, 6 Mar 2017 10:52:36 -0600 Subject: [PATCH] Mark block storage v2 as deprecated The Cinder v2 API is now deprecated. This moves that reference to the "deprecated" section. This also removes the link for v1 as that has now been removed from Cinder. Also redirects the link for v1 to the v2 and v3 landing page. Change-Id: I8f65c005804cd2b38151b928212585d7a7177bbb Depends-on: I913c44799cddc37c3342729ec0ef34068db5b2d4 --- api-quick-start/source/index.rst | 7 +++++-- www/static/.htaccess | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/api-quick-start/source/index.rst b/api-quick-start/source/index.rst index 77f3ec5ee..bd41a8711 100644 --- a/api-quick-start/source/index.rst +++ b/api-quick-start/source/index.rst @@ -62,12 +62,15 @@ Current API versions Supported API versions ---------------------- -`Block Storage API v2 `__ Deprecated API versions ----------------------- -`Block Storage API v1 `__ +`Block Storage API v2 `__ + +.. note:: The Block Storage API v3 is functionally identical to the + Block Storage API v2. Subsequent API v3 microversions, such as v3.1, + differ from API v2. `Identity API v2.0 `__ diff --git a/www/static/.htaccess b/www/static/.htaccess index 3dec6b301..3f29be3c4 100644 --- a/www/static/.htaccess +++ b/www/static/.htaccess @@ -20,6 +20,8 @@ redirect 301 /api-ref-baremetal-v1.html /api-ref/baremetal/index.html # Redirect WADL-based Block Storage API docs to in-tree docs redirect 301 /api-ref-blockstorage-v1.html /api-ref/block-storage/index.html redirect 301 /api-ref-blockstorage-v2.html /api-ref/block-storage/index.html +# Redirect Block Storage API v1 to v2 and v3 landing +redirect 301 /api-ref/block-storage/v1/index.html /api-ref/block-storage/index.html # Redirect WADL-based Identity API docs to in-tree docs redirect 301 /api-ref-identity-v2.html /api-ref/identity/v2/index.html redirect 301 /api-ref-identity-admin-v2.html /api-ref/identity/v2-admin/index.html @@ -43,4 +45,4 @@ redirect 301 /api-ref-share-v2.html /api-ref/shared-file-systems/index.html # Redirect Shared File Systems API v1 redirect 301 /api-ref-share-v1.html /api-ref/shared-file-systems/index.html # Redirect Telemetry (ceilometer only) API -redirect 301 /api-ref-telemetry-v2.html http://docs.openstack.org/developer/ceilometer/webapi/v2.html \ No newline at end of file +redirect 301 /api-ref-telemetry-v2.html http://docs.openstack.org/developer/ceilometer/webapi/v2.html