From ef0df98f9e89225661ecfabc66babce2a5b47304 Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Thu, 1 Mar 2018 13:03:48 -0500 Subject: [PATCH] Close out queens in glance-specs repo Update queens specs from 'approved' to 'implemented' or to rocky/approved or to untargeted, define the redirects, and make appropriate changes on the supporting pages. Change-Id: I48aa6a2f11831ffc544e8b02b0bfdb80aa51d3e2 --- doc/source/_extra/.htaccess | 5 +++ doc/source/index.rst | 32 +++++++++---------- doc/test/redirect-tests.txt | 5 +++ priorities/rocky-priorities.rst | 22 +++++++++++++ specs/mitaka/index.rst | 1 - specs/queens/approved/index.rst | 29 +++-------------- .../image-import/image-import-refactor.rst | 0 .../import-request-example-gd.json | 0 .../import-request-example-sl.json | 0 .../glance}/image-import/import-schema.json | 0 .../value-discovery-response.json | 0 .../approved/glance/multihash.rst | 0 .../approved/glance/remove-registry-v1.rst | 0 .../approved/glance/remove-v1.rst | 0 specs/rocky/approved/index.rst | 4 +-- specs/untargeted/index.rst | 16 +++++----- .../no-schema-validation.rst | 0 17 files changed, 62 insertions(+), 52 deletions(-) create mode 100644 priorities/rocky-priorities.rst rename specs/{mitaka/approved => rocky/approved/glance}/image-import/image-import-refactor.rst (100%) rename specs/{mitaka/approved => rocky/approved/glance}/image-import/import-request-example-gd.json (100%) rename specs/{mitaka/approved => rocky/approved/glance}/image-import/import-request-example-sl.json (100%) rename specs/{mitaka/approved => rocky/approved/glance}/image-import/import-schema.json (100%) rename specs/{mitaka/approved => rocky/approved/glance}/image-import/value-discovery-response.json (100%) rename specs/{queens => rocky}/approved/glance/multihash.rst (100%) rename specs/{queens => rocky}/approved/glance/remove-registry-v1.rst (100%) rename specs/{queens => rocky}/approved/glance/remove-v1.rst (100%) rename specs/{queens/approved => untargeted}/python-glanceclient/no-schema-validation.rst (100%) diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess index 2846524a..87c78768 100644 --- a/doc/source/_extra/.htaccess +++ b/doc/source/_extra/.htaccess @@ -4,3 +4,8 @@ Redirect 301 /specs/queens/approved/glance/deprecate-registry.html /specs/queens Redirect 301 /specs/queens/approved/glance/inject-automatic-metadata.html /specs/queens/implemented/glance/inject-automatic-metadata.html Redirect 301 /specs/queens/approved/glance/lite-spec-scrubber-refactor.html /specs/queens/implemented/glance/lite-spec-scrubber-refactor.html Redirect 301 /specs/queens/approved/python-glanceclient/deprecate-v1-support.rst /specs/rocky/approved/python-glanceclient/deprecate-v1-support.rst +Redirect 301 /specs/queens/approved/glance/multihash.html specs/rocky/approved/glance/multihash.html +Redirect 301 /specs/queens/approved/glance/remove-registry-v1.html /specs/rocky/approved/glance/remove-registry-v1.html +Redirect 301 /specs/queens/approved/glance/remove-v1.html /specs/rocky/approved/glance/remove-v1.html +Redirect 301 /specs/mitaka/approved/image-import/image-import-refactor.html /specs/rocky/approved/glance/image-import/image-import-refactor.html +Redirect 301 /specs/queens/approved/python-glanceclient/no-schema-validation.html /specs/untargeted/python-glanceclient/no-schema-validation.html diff --git a/doc/source/index.rst b/doc/source/index.rst index 0240b3e0..3b7a64f9 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -43,7 +43,7 @@ of those discussions: :glob: :maxdepth: 1 - priorities/queens-priorities + priorities/rocky-priorities previous-priorities Specifications @@ -56,18 +56,15 @@ Current :glob: :maxdepth: 1 - specs/queens/* + specs/rocky/* specs/untargeted/* -Future ------- - -.. toctree:: - :glob: - :maxdepth: 1 - - specs/rocky/* +.. Future +.. ------ +.. .. toctree:: +.. :glob: +.. :maxdepth: 1 Past ---- @@ -76,6 +73,7 @@ Past :glob: :maxdepth: 1 + specs/queens/* specs/pike/* specs/ocata/* specs/newton/* @@ -84,9 +82,12 @@ Past specs/kilo/index specs/juno/index -==================== -Image service V2 API -==================== + +Image Service API Guide +======================= + +Image Service API v2 +-------------------- .. toctree:: :maxdepth: 1 @@ -100,9 +101,8 @@ Image service V2 API specs/api/v2/sharing-image-api-v2.rst specs/api/v2/http-patch-image-api-v2.rst -==================== -Image service V1 API -==================== +Image Service API v1 +-------------------- .. include:: specs/api/v1/deprecation-note.inc diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt index d5fb92bc..297e0c81 100644 --- a/doc/test/redirect-tests.txt +++ b/doc/test/redirect-tests.txt @@ -5,3 +5,8 @@ /specs/queens/approved/glance/inject-automatic-metadata.html 301 /specs/queens/implemented/glance/inject-automatic-metadata.html /specs/queens/approved/glance/lite-spec-scrubber-refactor.html 301 /specs/queens/implemented/glance/lite-spec-scrubber-refactor.html /specs/queens/approved/python-glanceclient/deprecate-v1-support.rst 301 /specs/rocky/approved/python-glanceclient/deprecate-v1-support.rst +/specs/queens/approved/glance/multihash.html 301 specs/rocky/approved/glance/multihash.html +/specs/queens/approved/glance/remove-registry-v1.html 301 /specs/rocky/approved/glance/remove-registry-v1.html +/specs/queens/approved/glance/remove-v1.html 301 /specs/rocky/approved/glance/remove-v1.html +/specs/mitaka/approved/image-import/image-import-refactor.html 301 /specs/rocky/approved/glance/image-import/image-import-refactor.html +/specs/queens/approved/python-glanceclient/no-schema-validation.html 301 /specs/untargeted/python-glanceclient/no-schema-validation.html diff --git a/priorities/rocky-priorities.rst b/priorities/rocky-priorities.rst new file mode 100644 index 00000000..1ab96dd1 --- /dev/null +++ b/priorities/rocky-priorities.rst @@ -0,0 +1,22 @@ +.. _rocky-priorities: + +======================= +Rocky Review Priorities +======================= + +The Rocky review priorities were discussed at the Dublin PTG and refined +during the spec review process early in the Rocky cycle. The preliminary +list was maintained on the `Rocky PTG etherpad`_. + +This list is an estimate of what the Glance project team can accomplish +during the Rocky cycle based on our developers' estimates of how much +time they can commit to Glance. If additional resources become available, +it's possible that some of the :doc:`../specs/untargeted/index` could be +added to Rocky. + +The following list is roughly in priority order (highest to lowest). + +TODO: add priorities + +.. _Rocky PTG etherpad: https://etherpad.openstack.org/p/glance-rocky-ptg + diff --git a/specs/mitaka/index.rst b/specs/mitaka/index.rst index 4c0e1297..52921935 100644 --- a/specs/mitaka/index.rst +++ b/specs/mitaka/index.rst @@ -21,4 +21,3 @@ Mitaka approved (but not implemented) specs: :maxdepth: 1 approved/* - approved/image-import/* diff --git a/specs/queens/approved/index.rst b/specs/queens/approved/index.rst index a3ac6546..4cf5dab6 100644 --- a/specs/queens/approved/index.rst +++ b/specs/queens/approved/index.rst @@ -2,29 +2,8 @@ Queens Approved Specifications ============================== -.. toctree:: - :glob: - :maxdepth: 1 +All Queens specs have either been: -Queens approved specs for Glance: - -.. toctree:: - :glob: - :maxdepth: 1 - - glance/* - -Queens approved specs for glance_store: - - There are no specs approved for glance_store for Queens. - Please consult the :doc:`../../untargeted/index` if - you'd like to work on glance_store during the Queens - development cycle. - -Queens approved specs for python-glanceclient: - -.. toctree:: - :glob: - :maxdepth: 1 - - python-glanceclient/* +* moved to :doc:`../implemented/index` +* moved to :doc:`../../rocky/approved/index`, or +* moved to :doc:`../../untargeted/index` diff --git a/specs/mitaka/approved/image-import/image-import-refactor.rst b/specs/rocky/approved/glance/image-import/image-import-refactor.rst similarity index 100% rename from specs/mitaka/approved/image-import/image-import-refactor.rst rename to specs/rocky/approved/glance/image-import/image-import-refactor.rst diff --git a/specs/mitaka/approved/image-import/import-request-example-gd.json b/specs/rocky/approved/glance/image-import/import-request-example-gd.json similarity index 100% rename from specs/mitaka/approved/image-import/import-request-example-gd.json rename to specs/rocky/approved/glance/image-import/import-request-example-gd.json diff --git a/specs/mitaka/approved/image-import/import-request-example-sl.json b/specs/rocky/approved/glance/image-import/import-request-example-sl.json similarity index 100% rename from specs/mitaka/approved/image-import/import-request-example-sl.json rename to specs/rocky/approved/glance/image-import/import-request-example-sl.json diff --git a/specs/mitaka/approved/image-import/import-schema.json b/specs/rocky/approved/glance/image-import/import-schema.json similarity index 100% rename from specs/mitaka/approved/image-import/import-schema.json rename to specs/rocky/approved/glance/image-import/import-schema.json diff --git a/specs/mitaka/approved/image-import/value-discovery-response.json b/specs/rocky/approved/glance/image-import/value-discovery-response.json similarity index 100% rename from specs/mitaka/approved/image-import/value-discovery-response.json rename to specs/rocky/approved/glance/image-import/value-discovery-response.json diff --git a/specs/queens/approved/glance/multihash.rst b/specs/rocky/approved/glance/multihash.rst similarity index 100% rename from specs/queens/approved/glance/multihash.rst rename to specs/rocky/approved/glance/multihash.rst diff --git a/specs/queens/approved/glance/remove-registry-v1.rst b/specs/rocky/approved/glance/remove-registry-v1.rst similarity index 100% rename from specs/queens/approved/glance/remove-registry-v1.rst rename to specs/rocky/approved/glance/remove-registry-v1.rst diff --git a/specs/queens/approved/glance/remove-v1.rst b/specs/rocky/approved/glance/remove-v1.rst similarity index 100% rename from specs/queens/approved/glance/remove-v1.rst rename to specs/rocky/approved/glance/remove-v1.rst diff --git a/specs/rocky/approved/index.rst b/specs/rocky/approved/index.rst index 36906baf..52e0d0c5 100644 --- a/specs/rocky/approved/index.rst +++ b/specs/rocky/approved/index.rst @@ -12,8 +12,8 @@ Rocky approved specs for Glance: :glob: :maxdepth: 1 -.. glance/* -.. glance/image-import/* + glance/* + glance/image-import/* Rocky approved specs for glance_store: diff --git a/specs/untargeted/index.rst b/specs/untargeted/index.rst index f922371d..202b187d 100644 --- a/specs/untargeted/index.rst +++ b/specs/untargeted/index.rst @@ -1,6 +1,6 @@ -================================= -Utargeted Approved Specifications -================================= +================================== +Untargeted Approved Specifications +================================== The following specs have been reviewed and approved but have not been targeted for a release because the proposer is no longer @@ -34,10 +34,10 @@ Approved untargeted specs for glance_store: glance_store/* -.. Approved untargeted specs for python-glanceclient: +Approved untargeted specs for python-glanceclient: -.. .. toctree:: -.. :glob: -.. :maxdepth: 1 +.. toctree:: + :glob: + :maxdepth: 1 -.. python-glanceclient/* + python-glanceclient/* diff --git a/specs/queens/approved/python-glanceclient/no-schema-validation.rst b/specs/untargeted/python-glanceclient/no-schema-validation.rst similarity index 100% rename from specs/queens/approved/python-glanceclient/no-schema-validation.rst rename to specs/untargeted/python-glanceclient/no-schema-validation.rst