summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Rosmaita <rosmaita.fossdev@gmail.com>2018-03-01 13:03:48 -0500
committerBrian Rosmaita <rosmaita.fossdev@gmail.com>2018-03-05 05:15:33 -0500
commitef0df98f9e89225661ecfabc66babce2a5b47304 (patch)
treeff96cf3099d6c6e18da1eb44c621bff2faca3369
parentc70688ce6ec1e3c457aab6468f07260536257b8d (diff)
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
Notes
Notes (review): Code-Review+2: Erno Kuvaja <jokke@usr.fi> Workflow+1: Erno Kuvaja <jokke@usr.fi> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 05 Mar 2018 10:46:26 +0000 Reviewed-on: https://review.openstack.org/549055 Project: openstack/glance-specs Branch: refs/heads/master
-rw-r--r--doc/source/_extra/.htaccess5
-rw-r--r--doc/source/index.rst32
-rw-r--r--doc/test/redirect-tests.txt5
-rw-r--r--priorities/rocky-priorities.rst22
-rw-r--r--specs/mitaka/index.rst1
-rw-r--r--specs/queens/approved/index.rst29
-rw-r--r--specs/rocky/approved/glance/image-import/image-import-refactor.rst (renamed from specs/mitaka/approved/image-import/image-import-refactor.rst)0
-rw-r--r--specs/rocky/approved/glance/image-import/import-request-example-gd.json (renamed from specs/mitaka/approved/image-import/import-request-example-gd.json)0
-rw-r--r--specs/rocky/approved/glance/image-import/import-request-example-sl.json (renamed from specs/mitaka/approved/image-import/import-request-example-sl.json)0
-rw-r--r--specs/rocky/approved/glance/image-import/import-schema.json (renamed from specs/mitaka/approved/image-import/import-schema.json)0
-rw-r--r--specs/rocky/approved/glance/image-import/value-discovery-response.json (renamed from specs/mitaka/approved/image-import/value-discovery-response.json)0
-rw-r--r--specs/rocky/approved/glance/multihash.rst (renamed from specs/queens/approved/glance/multihash.rst)0
-rw-r--r--specs/rocky/approved/glance/remove-registry-v1.rst (renamed from specs/queens/approved/glance/remove-registry-v1.rst)0
-rw-r--r--specs/rocky/approved/glance/remove-v1.rst (renamed from specs/queens/approved/glance/remove-v1.rst)0
-rw-r--r--specs/rocky/approved/index.rst4
-rw-r--r--specs/untargeted/index.rst16
-rw-r--r--specs/untargeted/python-glanceclient/no-schema-validation.rst (renamed from specs/queens/approved/python-glanceclient/no-schema-validation.rst)0
17 files changed, 62 insertions, 52 deletions
diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess
index 2846524..87c7876 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
4Redirect 301 /specs/queens/approved/glance/inject-automatic-metadata.html /specs/queens/implemented/glance/inject-automatic-metadata.html 4Redirect 301 /specs/queens/approved/glance/inject-automatic-metadata.html /specs/queens/implemented/glance/inject-automatic-metadata.html
5Redirect 301 /specs/queens/approved/glance/lite-spec-scrubber-refactor.html /specs/queens/implemented/glance/lite-spec-scrubber-refactor.html 5Redirect 301 /specs/queens/approved/glance/lite-spec-scrubber-refactor.html /specs/queens/implemented/glance/lite-spec-scrubber-refactor.html
6Redirect 301 /specs/queens/approved/python-glanceclient/deprecate-v1-support.rst /specs/rocky/approved/python-glanceclient/deprecate-v1-support.rst 6Redirect 301 /specs/queens/approved/python-glanceclient/deprecate-v1-support.rst /specs/rocky/approved/python-glanceclient/deprecate-v1-support.rst
7Redirect 301 /specs/queens/approved/glance/multihash.html specs/rocky/approved/glance/multihash.html
8Redirect 301 /specs/queens/approved/glance/remove-registry-v1.html /specs/rocky/approved/glance/remove-registry-v1.html
9Redirect 301 /specs/queens/approved/glance/remove-v1.html /specs/rocky/approved/glance/remove-v1.html
10Redirect 301 /specs/mitaka/approved/image-import/image-import-refactor.html /specs/rocky/approved/glance/image-import/image-import-refactor.html
11Redirect 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 0240b3e..3b7a64f 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -43,7 +43,7 @@ of those discussions:
43 :glob: 43 :glob:
44 :maxdepth: 1 44 :maxdepth: 1
45 45
46 priorities/queens-priorities 46 priorities/rocky-priorities
47 previous-priorities 47 previous-priorities
48 48
49Specifications 49Specifications
@@ -56,18 +56,15 @@ Current
56 :glob: 56 :glob:
57 :maxdepth: 1 57 :maxdepth: 1
58 58
59 specs/queens/* 59 specs/rocky/*
60 specs/untargeted/* 60 specs/untargeted/*
61 61
62Future 62.. Future
63------ 63.. ------
64
65.. toctree::
66 :glob:
67 :maxdepth: 1
68
69 specs/rocky/*
70 64
65.. .. toctree::
66.. :glob:
67.. :maxdepth: 1
71 68
72Past 69Past
73---- 70----
@@ -76,6 +73,7 @@ Past
76 :glob: 73 :glob:
77 :maxdepth: 1 74 :maxdepth: 1
78 75
76 specs/queens/*
79 specs/pike/* 77 specs/pike/*
80 specs/ocata/* 78 specs/ocata/*
81 specs/newton/* 79 specs/newton/*
@@ -84,9 +82,12 @@ Past
84 specs/kilo/index 82 specs/kilo/index
85 specs/juno/index 83 specs/juno/index
86 84
87==================== 85
88Image service V2 API 86Image Service API Guide
89==================== 87=======================
88
89Image Service API v2
90--------------------
90 91
91.. toctree:: 92.. toctree::
92 :maxdepth: 1 93 :maxdepth: 1
@@ -100,9 +101,8 @@ Image service V2 API
100 specs/api/v2/sharing-image-api-v2.rst 101 specs/api/v2/sharing-image-api-v2.rst
101 specs/api/v2/http-patch-image-api-v2.rst 102 specs/api/v2/http-patch-image-api-v2.rst
102 103
103==================== 104Image Service API v1
104Image service V1 API 105--------------------
105====================
106 106
107.. include:: specs/api/v1/deprecation-note.inc 107.. include:: specs/api/v1/deprecation-note.inc
108 108
diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt
index d5fb92b..297e0c8 100644
--- a/doc/test/redirect-tests.txt
+++ b/doc/test/redirect-tests.txt
@@ -5,3 +5,8 @@
5/specs/queens/approved/glance/inject-automatic-metadata.html 301 /specs/queens/implemented/glance/inject-automatic-metadata.html 5/specs/queens/approved/glance/inject-automatic-metadata.html 301 /specs/queens/implemented/glance/inject-automatic-metadata.html
6/specs/queens/approved/glance/lite-spec-scrubber-refactor.html 301 /specs/queens/implemented/glance/lite-spec-scrubber-refactor.html 6/specs/queens/approved/glance/lite-spec-scrubber-refactor.html 301 /specs/queens/implemented/glance/lite-spec-scrubber-refactor.html
7/specs/queens/approved/python-glanceclient/deprecate-v1-support.rst 301 /specs/rocky/approved/python-glanceclient/deprecate-v1-support.rst 7/specs/queens/approved/python-glanceclient/deprecate-v1-support.rst 301 /specs/rocky/approved/python-glanceclient/deprecate-v1-support.rst
8/specs/queens/approved/glance/multihash.html 301 specs/rocky/approved/glance/multihash.html
9/specs/queens/approved/glance/remove-registry-v1.html 301 /specs/rocky/approved/glance/remove-registry-v1.html
10/specs/queens/approved/glance/remove-v1.html 301 /specs/rocky/approved/glance/remove-v1.html
11/specs/mitaka/approved/image-import/image-import-refactor.html 301 /specs/rocky/approved/glance/image-import/image-import-refactor.html
12/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 0000000..1ab96dd
--- /dev/null
+++ b/priorities/rocky-priorities.rst
@@ -0,0 +1,22 @@
1.. _rocky-priorities:
2
3=======================
4Rocky Review Priorities
5=======================
6
7The Rocky review priorities were discussed at the Dublin PTG and refined
8during the spec review process early in the Rocky cycle. The preliminary
9list was maintained on the `Rocky PTG etherpad`_.
10
11This list is an estimate of what the Glance project team can accomplish
12during the Rocky cycle based on our developers' estimates of how much
13time they can commit to Glance. If additional resources become available,
14it's possible that some of the :doc:`../specs/untargeted/index` could be
15added to Rocky.
16
17The following list is roughly in priority order (highest to lowest).
18
19TODO: add priorities
20
21.. _Rocky PTG etherpad: https://etherpad.openstack.org/p/glance-rocky-ptg
22
diff --git a/specs/mitaka/index.rst b/specs/mitaka/index.rst
index 4c0e129..5292193 100644
--- a/specs/mitaka/index.rst
+++ b/specs/mitaka/index.rst
@@ -21,4 +21,3 @@ Mitaka approved (but not implemented) specs:
21 :maxdepth: 1 21 :maxdepth: 1
22 22
23 approved/* 23 approved/*
24 approved/image-import/*
diff --git a/specs/queens/approved/index.rst b/specs/queens/approved/index.rst
index a3ac654..4cf5dab 100644
--- a/specs/queens/approved/index.rst
+++ b/specs/queens/approved/index.rst
@@ -2,29 +2,8 @@
2Queens Approved Specifications 2Queens Approved Specifications
3============================== 3==============================
4 4
5.. toctree:: 5All Queens specs have either been:
6 :glob:
7 :maxdepth: 1
8 6
9Queens approved specs for Glance: 7* moved to :doc:`../implemented/index`
10 8* moved to :doc:`../../rocky/approved/index`, or
11.. toctree:: 9* moved to :doc:`../../untargeted/index`
12 :glob:
13 :maxdepth: 1
14
15 glance/*
16
17Queens approved specs for glance_store:
18
19 There are no specs approved for glance_store for Queens.
20 Please consult the :doc:`../../untargeted/index` if
21 you'd like to work on glance_store during the Queens
22 development cycle.
23
24Queens approved specs for python-glanceclient:
25
26.. toctree::
27 :glob:
28 :maxdepth: 1
29
30 python-glanceclient/*
diff --git a/specs/mitaka/approved/image-import/image-import-refactor.rst b/specs/rocky/approved/glance/image-import/image-import-refactor.rst
index fe13076..fe13076 100644
--- a/specs/mitaka/approved/image-import/image-import-refactor.rst
+++ b/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
index 939a25c..939a25c 100644
--- a/specs/mitaka/approved/image-import/import-request-example-gd.json
+++ b/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
index afcdac1..afcdac1 100644
--- a/specs/mitaka/approved/image-import/import-request-example-sl.json
+++ b/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
index 183f2f1..183f2f1 100644
--- a/specs/mitaka/approved/image-import/import-schema.json
+++ b/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
index 7533d0e..7533d0e 100644
--- a/specs/mitaka/approved/image-import/value-discovery-response.json
+++ b/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
index 44cecbf..44cecbf 100644
--- a/specs/queens/approved/glance/multihash.rst
+++ b/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
index 20d07a4..20d07a4 100644
--- a/specs/queens/approved/glance/remove-registry-v1.rst
+++ b/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
index 4147dfa..4147dfa 100644
--- a/specs/queens/approved/glance/remove-v1.rst
+++ b/specs/rocky/approved/glance/remove-v1.rst
diff --git a/specs/rocky/approved/index.rst b/specs/rocky/approved/index.rst
index 36906ba..52e0d0c 100644
--- a/specs/rocky/approved/index.rst
+++ b/specs/rocky/approved/index.rst
@@ -12,8 +12,8 @@ Rocky approved specs for Glance:
12 :glob: 12 :glob:
13 :maxdepth: 1 13 :maxdepth: 1
14 14
15.. glance/* 15 glance/*
16.. glance/image-import/* 16 glance/image-import/*
17 17
18Rocky approved specs for glance_store: 18Rocky approved specs for glance_store:
19 19
diff --git a/specs/untargeted/index.rst b/specs/untargeted/index.rst
index f922371..202b187 100644
--- a/specs/untargeted/index.rst
+++ b/specs/untargeted/index.rst
@@ -1,6 +1,6 @@
1================================= 1==================================
2Utargeted Approved Specifications 2Untargeted Approved Specifications
3================================= 3==================================
4 4
5The following specs have been reviewed and approved but have 5The following specs have been reviewed and approved but have
6not been targeted for a release because the proposer is no longer 6not been targeted for a release because the proposer is no longer
@@ -34,10 +34,10 @@ Approved untargeted specs for glance_store:
34 34
35 glance_store/* 35 glance_store/*
36 36
37.. Approved untargeted specs for python-glanceclient: 37Approved untargeted specs for python-glanceclient:
38 38
39.. .. toctree:: 39.. toctree::
40.. :glob: 40 :glob:
41.. :maxdepth: 1 41 :maxdepth: 1
42 42
43.. python-glanceclient/* 43 python-glanceclient/*
diff --git a/specs/queens/approved/python-glanceclient/no-schema-validation.rst b/specs/untargeted/python-glanceclient/no-schema-validation.rst
index 05283ef..05283ef 100644
--- a/specs/queens/approved/python-glanceclient/no-schema-validation.rst
+++ b/specs/untargeted/python-glanceclient/no-schema-validation.rst