Retarget specs to ussuri

Move some specs that didn't get completed in Train but which are
being worked on for delivery in ussuri to the appropriate directory,
and set up redirects so that train URLs for the specs will redirect
to the current location.

Change-Id: Ic73f4801b8307ad2a0c9be0f3ab6c12b4019e0e7

doc/source/_extra/.htaccess

@@ -0,0 +1,5 @@
+# This file contains redirects to handle existing URLs for specs
+# that have been moved
+Redirect 301 /specs/train/image-encryption.rst /specs/ussuri/image-encryption.rst
+Redirect 301 /specs/train/support-glance-multiple-backend.rst /specs/ussuri/support-glance-multiple-backend.rst
+Redirect 301 /specs/train/query-cinder-resources-filter-by-time-comparison-operators.rst /specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.rst

doc/source/conf.py

@@ -150,6 +150,10 @@ html_last_updated_fmt = '%Y-%m-%d %H:%M'
 # template names.
 #html_additional_pages = {}
 
+# Add any paths that contain "extra" files, such as .htaccess or
+# robots.txt.
+html_extra_path = ['_extra']
+
 # If false, no module index is generated.
 html_domain_indices = False
 

doc/source/index.rst

@@ -7,10 +7,6 @@ Block Storage Service Specifications (cinder)
 Ussuri approved specs
 =====================
 
-.. any patch adding a spec should remove the following line:
-
-* No specs have yet been approved.
-
 .. toctree::
    :glob:
    :maxdepth: 1

doc/test/redirect-tests.txt

@@ -0,0 +1,6 @@
+# This file contains tests for redirects to handle existing URLs for
+# specs that have been moved. See
+# https://docs.openstack.org/whereto/latest/ for details.
+/specs/train/image-encryption.rst 301 /specs/ussuri/image-encryption.rst
+/specs/train/support-glance-multiple-backend.rst 301 /specs/ussuri/support-glance-multiple-backend.rst
+/specs/train/query-cinder-resources-filter-by-time-comparison-operators.rst 301 /specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.rst

test-requirements.txt

@@ -7,3 +7,4 @@ sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
 flake8
 yasfb>=0.5.1
 doc8>=0.6.0 # Apache-2.0
+whereto>=0.3.0  # Apache-2.0

tox.ini

@@ -18,6 +18,7 @@ commands =
   rm -fr doc/build
   python setup.py build_sphinx
   doc8 --ignore D001 doc/source
+  whereto doc/source/_extra/.htaccess doc/test/redirect-tests.txt
 
 [testenv:pep8]
 commands =