From c70688ce6ec1e3c457aab6468f07260536257b8d Mon Sep 17 00:00:00 2001
From: Erno Kuvaja <jokke@usr.fi>
Date: Thu, 1 Mar 2018 10:11:04 +0000
Subject: [PATCH] Client v1 support removal update

Did not happen in Queens, lets try this again in Rocky.

Change-Id: Ib2d9f737a718353d399deb475378b1b6b9c933f0
---
 doc/source/_extra/.htaccess                   |  1 +
 doc/test/redirect-tests.txt                   |  1 +
 specs/rocky/approved/index.rst                | 31 +++++++++++++++++++
 .../deprecate-v1-support.rst                  |  9 +++---
 specs/rocky/index.rst                         |  2 +-
 5 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 specs/rocky/approved/index.rst
 rename specs/{queens => rocky}/approved/python-glanceclient/deprecate-v1-support.rst (73%)

diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess
index 7c65af5e..2846524a 100644
--- a/doc/source/_extra/.htaccess
+++ b/doc/source/_extra/.htaccess
@@ -3,3 +3,4 @@
 Redirect 301 /specs/queens/approved/glance/deprecate-registry.html /specs/queens/implemented/glance/deprecate-registry.html
 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
diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt
index 5e314b91..d5fb92bc 100644
--- a/doc/test/redirect-tests.txt
+++ b/doc/test/redirect-tests.txt
@@ -4,3 +4,4 @@
 /specs/queens/approved/glance/deprecate-registry.html 301 /specs/queens/implemented/glance/deprecate-registry.html
 /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
diff --git a/specs/rocky/approved/index.rst b/specs/rocky/approved/index.rst
new file mode 100644
index 00000000..36906baf
--- /dev/null
+++ b/specs/rocky/approved/index.rst
@@ -0,0 +1,31 @@
+=============================
+Rocky Approved Specifications
+=============================
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+Rocky approved specs for Glance:
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+..   glance/*
+..   glance/image-import/*
+
+Rocky approved specs for glance_store:
+
+   There are no specs approved for glance_store for Rocky.
+   Please consult the :doc:`../../untargeted/index` if
+   you'd like to work on glance_store during the Rocky
+   development cycle.
+
+Rocky approved specs for python-glanceclient:
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   python-glanceclient/*
diff --git a/specs/queens/approved/python-glanceclient/deprecate-v1-support.rst b/specs/rocky/approved/python-glanceclient/deprecate-v1-support.rst
similarity index 73%
rename from specs/queens/approved/python-glanceclient/deprecate-v1-support.rst
rename to specs/rocky/approved/python-glanceclient/deprecate-v1-support.rst
index b51e2a79..25789dd1 100644
--- a/specs/queens/approved/python-glanceclient/deprecate-v1-support.rst
+++ b/specs/rocky/approved/python-glanceclient/deprecate-v1-support.rst
@@ -2,12 +2,12 @@
 Spec Lite: Deprecate Images API v1 Support
 ==========================================
 
-:problem: The Images API v1 is targeted to be removed in Queens, hence there
+:problem: The Images API v1 is targeted to be removed in Rocky, hence there
           is no reason to continue carrying v1 support in the glanceclient.
 
-:solution: Announce that the Queens release of the python-glanceclient will
+:solution: Announce that the Rocky release of the python-glanceclient will
            be the last release that will support the Images v1 API and that
-           support will be removed in the first major release of the Rocky
+           support will be removed in the first major release of the S
            cycle.
 
 :impacts: DocImpact
@@ -17,8 +17,7 @@ Spec Lite: Deprecate Images API v1 Support
                v1 was never included in "DefCore" tests.  Continued support
                would not be a good use of the team's time.
 
-:timeline: Q-1 milestone (week of 16 October 2017), but definitely before
-           the Queens release of the glanceclient at Q-3
+:timeline: Early Rocky cycle
 
 :link: https://blueprints.launchpad.net/python-glanceclient/+spec/deprecate-v1-support
 
diff --git a/specs/rocky/index.rst b/specs/rocky/index.rst
index fcbe5870..6ccad754 100644
--- a/specs/rocky/index.rst
+++ b/specs/rocky/index.rst
@@ -20,4 +20,4 @@ Rocky approved (but not implemented) specs:
    :glob:
    :maxdepth: 1
 
-..   approved/*
+   approved/*