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

@@ -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

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
+.. Future
-------
+.. ------
-
-.. toctree::
-   :glob:
-   :maxdepth: 1
-   
-   specs/rocky/*
 
+.. .. 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 API v1
-Image service V1 API
+--------------------
-====================
 
 .. include:: specs/api/v1/deprecation-note.inc
 

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

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
+

specs/mitaka/index.rst

@@ -21,4 +21,3 @@ Mitaka approved (but not implemented) specs:
    :maxdepth: 1
 
    approved/*
-   approved/image-import/*

specs/queens/approved/index.rst

@@ -2,29 +2,8 @@
 Queens Approved Specifications
 ==============================
 
-.. toctree::
+All Queens specs have either been:
-   :glob:
-   :maxdepth: 1
 
-Queens approved specs for Glance:
+* moved to :doc:`../implemented/index`
-
+* moved to :doc:`../../rocky/approved/index`, or
-.. toctree::
+* moved to :doc:`../../untargeted/index`
-   :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/*

specs/rocky/approved/index.rst

@@ -12,8 +12,8 @@ Rocky approved specs for Glance:
    :glob:
    :maxdepth: 1
 
-..   glance/*
+   glance/*
-..   glance/image-import/*
+   glance/image-import/*
 
 Rocky approved specs for glance_store:
 

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::
+.. toctree::
-..    :glob:
+   :glob:
-..    :maxdepth: 1
+   :maxdepth: 1
 
-..    python-glanceclient/*
+   python-glanceclient/*