From d9fd388bda35d26fba721b3c217ef4f95ff21433 Mon Sep 17 00:00:00 2001 From: Erno Kuvaja Date: Thu, 16 May 2019 12:16:41 +0100 Subject: [PATCH] Move Stein implemented specs to 'implemented' Moves the appropriate specs from 'approved' to 'implemented' and sets up the http redirects so that current links to the specs won't break. Change-Id: I21834bf265fab97332a17fbca5f3bad89ae1dc0e --- doc/source/_extra/.htaccess | 6 ++++++ doc/source/index.rst | 3 +-- doc/test/redirect-tests.txt | 6 ++++++ .../approved/glance/spec-lite-template.rst | 1 - specs/stein/approved/glance/template.rst | 1 - .../glance_store/spec-lite-template.rst | 1 - specs/stein/approved/glance_store/template.rst | 1 - specs/stein/approved/index.rst | 16 +--------------- .../glance/all-visibility-image-filter.rst | 0 ...pec-lite-add-description-field-to-image.rst | 0 ...pec-lite-locations-with-validation-data.rst | 0 ...ite-readding-glance-cache-manage-for-v2.rst | 0 .../glance/windows-support.rst | 0 specs/stein/implemented/index.rst | 18 +++++++++++++++++- .../spec-lite-show-store-info.rst | 0 15 files changed, 31 insertions(+), 22 deletions(-) delete mode 100644 specs/stein/approved/glance/spec-lite-template.rst delete mode 100644 specs/stein/approved/glance/template.rst delete mode 100644 specs/stein/approved/glance_store/spec-lite-template.rst delete mode 100644 specs/stein/approved/glance_store/template.rst rename specs/stein/{approved => implemented}/glance/all-visibility-image-filter.rst (100%) rename specs/stein/{approved => implemented}/glance/spec-lite-add-description-field-to-image.rst (100%) rename specs/stein/{approved => implemented}/glance/spec-lite-locations-with-validation-data.rst (100%) rename specs/stein/{approved => implemented}/glance/spec-lite-readding-glance-cache-manage-for-v2.rst (100%) rename specs/stein/{approved => implemented}/glance/windows-support.rst (100%) rename specs/stein/{approved => implemented}/python-glanceclient/spec-lite-show-store-info.rst (100%) diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess index 693f1539..c6aaa973 100644 --- a/doc/source/_extra/.htaccess +++ b/doc/source/_extra/.htaccess @@ -18,3 +18,9 @@ Redirect 301 /specs/rocky/approved/glance/multi-store.rst /specs/rocky/implement Redirect 301 /specs/rocky/approved/glance/operator-image-workflow.rst /specs/rocky/implemented/glance/operator-image-workflow.rst Redirect 301 /specs/rocky/approved/glance/remove-v1.rst /specs/rocky/implemented/glance/remove-v1.rst Redirect 301 /specs/rocky/approved/glance_store/deprecate-store_capabilities_update_min_interval.rst /specs/rocky/implemented/glance_store/deprecate-store_capabilities_update_min_interval.rst +Redirect 301 /specs/stein/approved/glance/all-visibility-image-filter.rst /specs/stein/implemented/glance/all-visibility-image-filter.rst +Redirect 301 /specs/stein/approved/glance/windows-support.rst /specs/stein/implemented/glance/windows-support.rst +Redirect 301 /specs/stein/approved/glance/spec-lite-locations-with-validation-data.rst /specs/stein/implemented/glance/spec-lite-locations-with-validation-data.rst +Redirect 301 /specs/stein/approved/glance/spec-lite-add-description-field-to-image.rst /specs/stein/implemented/glance/spec-lite-add-description-field-to-image.rst +Redirect 301 /specs/stein/approved/glance/spec-lite-readding-glance-cache-manage-for-v2.rst /specs/stein/implemented/glance/spec-lite-readding-glance-cache-manage-for-v2.rst +Redirect 301 /specs/stein/approved/python-glanceclient/spec-lite-show-store-info.rst /specs/stein/implemented/python-glanceclient/spec-lite-show-store-info.rst diff --git a/doc/source/index.rst b/doc/source/index.rst index b4907e06..32c74503 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -44,7 +44,6 @@ of those discussions: :maxdepth: 1 priorities/train-priorities - priorities/stein-priorities previous-priorities Specifications @@ -58,7 +57,6 @@ Current :maxdepth: 1 specs/train/* - specs/stein/* specs/untargeted/* .. Future @@ -75,6 +73,7 @@ Past :glob: :maxdepth: 1 + specs/stein/* specs/rocky/* specs/queens/* specs/pike/* diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt index 33da24c5..17138a1a 100644 --- a/doc/test/redirect-tests.txt +++ b/doc/test/redirect-tests.txt @@ -19,3 +19,9 @@ /specs/rocky/approved/glance/operator-image-workflow.rst 301 /specs/rocky/implemented/glance/operator-image-workflow.rst /specs/rocky/approved/glance/remove-v1.rst 301 /specs/rocky/implemented/glance/remove-v1.rst /specs/rocky/approved/glance_store/deprecate-store_capabilities_update_min_interval.rst 301 /specs/rocky/implemented/glance_store/deprecate-store_capabilities_update_min_interval.rst +/specs/stein/approved/glance/all-visibility-image-filter.rst 301 /specs/stein/implemented/glance/all-visibility-image-filter.rst +/specs/stein/approved/glance/windows-support.rst 301 /specs/stein/implemented/glance/windows-support.rst +/specs/stein/approved/glance/spec-lite-locations-with-validation-data.rst 301 /specs/stein/implemented/glance/spec-lite-locations-with-validation-data.rst +/specs/stein/approved/glance/spec-lite-add-description-field-to-image.rst 301 /specs/stein/implemented/glance/spec-lite-add-description-field-to-image.rst +/specs/stein/approved/glance/spec-lite-readding-glance-cache-manage-for-v2.rst 301 /specs/stein/implemented/glance/spec-lite-readding-glance-cache-manage-for-v2.rst +/specs/stein/approved/python-glanceclient/spec-lite-show-store-info.rst 301 /specs/stein/implemented/python-glanceclient/spec-lite-show-store-info.rst diff --git a/specs/stein/approved/glance/spec-lite-template.rst b/specs/stein/approved/glance/spec-lite-template.rst deleted file mode 100644 index b7b2f611..00000000 --- a/specs/stein/approved/glance/spec-lite-template.rst +++ /dev/null @@ -1 +0,0 @@ -../../../spec-lite-template.rst diff --git a/specs/stein/approved/glance/template.rst b/specs/stein/approved/glance/template.rst deleted file mode 100644 index 26e0efd9..00000000 --- a/specs/stein/approved/glance/template.rst +++ /dev/null @@ -1 +0,0 @@ -../../../template.rst \ No newline at end of file diff --git a/specs/stein/approved/glance_store/spec-lite-template.rst b/specs/stein/approved/glance_store/spec-lite-template.rst deleted file mode 100644 index b7b2f611..00000000 --- a/specs/stein/approved/glance_store/spec-lite-template.rst +++ /dev/null @@ -1 +0,0 @@ -../../../spec-lite-template.rst diff --git a/specs/stein/approved/glance_store/template.rst b/specs/stein/approved/glance_store/template.rst deleted file mode 100644 index 26e0efd9..00000000 --- a/specs/stein/approved/glance_store/template.rst +++ /dev/null @@ -1 +0,0 @@ -../../../template.rst \ No newline at end of file diff --git a/specs/stein/approved/index.rst b/specs/stein/approved/index.rst index 18ad59e7..78247e52 100644 --- a/specs/stein/approved/index.rst +++ b/specs/stein/approved/index.rst @@ -7,18 +7,4 @@ Stein Approved Specifications :glob: :maxdepth: 1 -Stein approved specs for Glance: - -.. toctree:: - :glob: - :maxdepth: 1 - - glance/* - -Stein approved specs for python-glanceclient: - -.. toctree:: - :glob: - :maxdepth: 1 - - python-glanceclient/* +All Stein specs for Glance were implemented. diff --git a/specs/stein/approved/glance/all-visibility-image-filter.rst b/specs/stein/implemented/glance/all-visibility-image-filter.rst similarity index 100% rename from specs/stein/approved/glance/all-visibility-image-filter.rst rename to specs/stein/implemented/glance/all-visibility-image-filter.rst diff --git a/specs/stein/approved/glance/spec-lite-add-description-field-to-image.rst b/specs/stein/implemented/glance/spec-lite-add-description-field-to-image.rst similarity index 100% rename from specs/stein/approved/glance/spec-lite-add-description-field-to-image.rst rename to specs/stein/implemented/glance/spec-lite-add-description-field-to-image.rst diff --git a/specs/stein/approved/glance/spec-lite-locations-with-validation-data.rst b/specs/stein/implemented/glance/spec-lite-locations-with-validation-data.rst similarity index 100% rename from specs/stein/approved/glance/spec-lite-locations-with-validation-data.rst rename to specs/stein/implemented/glance/spec-lite-locations-with-validation-data.rst diff --git a/specs/stein/approved/glance/spec-lite-readding-glance-cache-manage-for-v2.rst b/specs/stein/implemented/glance/spec-lite-readding-glance-cache-manage-for-v2.rst similarity index 100% rename from specs/stein/approved/glance/spec-lite-readding-glance-cache-manage-for-v2.rst rename to specs/stein/implemented/glance/spec-lite-readding-glance-cache-manage-for-v2.rst diff --git a/specs/stein/approved/glance/windows-support.rst b/specs/stein/implemented/glance/windows-support.rst similarity index 100% rename from specs/stein/approved/glance/windows-support.rst rename to specs/stein/implemented/glance/windows-support.rst diff --git a/specs/stein/implemented/index.rst b/specs/stein/implemented/index.rst index 5317b24c..f536923b 100644 --- a/specs/stein/implemented/index.rst +++ b/specs/stein/implemented/index.rst @@ -2,4 +2,20 @@ Stein Implemented Specifications ================================ -TODO: fill this in until a new implemented space is added. +Implemented specs for Glance: + +.. toctree:: + :glob: + :maxdepth: 1 + + glance/* + +Implementes specs for python-glanceclient: + +.. toctree:: + :glob: + :maxdepth: 1 + + python-glanceclient/* + +No specs are implemented for glance-store in Stein. diff --git a/specs/stein/approved/python-glanceclient/spec-lite-show-store-info.rst b/specs/stein/implemented/python-glanceclient/spec-lite-show-store-info.rst similarity index 100% rename from specs/stein/approved/python-glanceclient/spec-lite-show-store-info.rst rename to specs/stein/implemented/python-glanceclient/spec-lite-show-store-info.rst