From 528b9b9779004468de45ff273b75950631f4aafd Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Tue, 29 Jun 2021 23:00:04 -0400 Subject: [PATCH] Update Xena specs Move unimplemented wallaby specs to xena and set up http redirects so that the old URLs won't 404. Change-Id: Ic7aa7e45ed9e6f09f72a87034cd0b88d1390117b --- doc/source/_extra/.htaccess | 9 ++++++--- doc/test/redirect-tests.txt | 9 ++++++--- specs/wallaby/nvme-agent.rst | 3 +++ specs/{wallaby => xena}/image-encryption.rst | 0 specs/{wallaby => xena}/reset-state-robustification.rst | 0 specs/{wallaby => xena}/sizing-encrypted-volumes.rst | 0 6 files changed, 15 insertions(+), 6 deletions(-) rename specs/{wallaby => xena}/image-encryption.rst (100%) rename specs/{wallaby => xena}/reset-state-robustification.rst (100%) rename specs/{wallaby => xena}/sizing-encrypted-volumes.rst (100%) diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess index 61d44329..f92f1c7b 100644 --- a/doc/source/_extra/.htaccess +++ b/doc/source/_extra/.htaccess @@ -1,8 +1,11 @@ # This file contains redirects to handle existing URLs for specs # that have been moved -Redirect 301 /openstack/cinder-specs/specs/train/image-encryption.html /openstack/cinder-specs/specs/wallaby/image-encryption.html -Redirect 301 /openstack/cinder-specs/specs/ussuri/image-encryption.html /openstack/cinder-specs/specs/wallaby/image-encryption.html -Redirect 301 /openstack/cinder-specs/specs/victoria/image-encryption.html /openstack/cinder-specs/specs/wallaby/image-encryption.html +Redirect 301 /openstack/cinder-specs/specs/train/image-encryption.html /openstack/cinder-specs/specs/xena/image-encryption.html +Redirect 301 /openstack/cinder-specs/specs/ussuri/image-encryption.html /openstack/cinder-specs/specs/xena/image-encryption.html +Redirect 301 /openstack/cinder-specs/specs/victoria/image-encryption.html /openstack/cinder-specs/specs/xena/image-encryption.html +Redirect 301 /openstack/cinder-specs/specs/wallaby/image-encryption.html /openstack/cinder-specs/specs/xena/image-encryption.html Redirect 301 /openstack/cinder-specs/specs/train/support-glance-multiple-backend.html /openstack/cinder-specs/specs/ussuri/support-glance-multiple-backend.html Redirect 301 /openstack/cinder-specs/specs/train/query-cinder-resources-filter-by-time-comparison-operators.html /openstack/cinder-specs/specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.html Redirect 301 /openstack/cinder-specs/specs/newton/specify-volume_type-and-availability_zone-for-backup-restore-API.html /openstack/cinder-specs/specs/wallaby/specify-volume_type-and-availability_zone-for-backup-restore-API.html +Redirect 301 /openstack/cinder-specs/specs/wallaby/reset-state-robustification.rst /openstack/cinder-specs/specs/xena/reset-state-robustification.rst +Redirect 301 /openstack/cinder-specs/specs/wallaby/sizing-encrypted-volumes.rst /openstack/cinder-specs/specs/xena/sizing-encrypted-volumes.rst diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt index f61af2a9..c3fca250 100644 --- a/doc/test/redirect-tests.txt +++ b/doc/test/redirect-tests.txt @@ -1,9 +1,12 @@ # 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. -/openstack/cinder-specs/specs/train/image-encryption.html 301 /openstack/cinder-specs/specs/wallaby/image-encryption.html -/openstack/cinder-specs/specs/ussuri/image-encryption.html 301 /openstack/cinder-specs/specs/wallaby/image-encryption.html -/openstack/cinder-specs/specs/victoria/image-encryption.html 301 /openstack/cinder-specs/specs/wallaby/image-encryption.html +/openstack/cinder-specs/specs/train/image-encryption.html 301 /openstack/cinder-specs/specs/xena/image-encryption.html +/openstack/cinder-specs/specs/ussuri/image-encryption.html 301 /openstack/cinder-specs/specs/xena/image-encryption.html +/openstack/cinder-specs/specs/victoria/image-encryption.html 301 /openstack/cinder-specs/specs/xena/image-encryption.html +/openstack/cinder-specs/specs/wallaby/image-encryption.html 301 /openstack/cinder-specs/specs/xena/image-encryption.html /openstack/cinder-specs/specs/train/support-glance-multiple-backend.html 301 /openstack/cinder-specs/specs/ussuri/support-glance-multiple-backend.html /openstack/cinder-specs/specs/train/query-cinder-resources-filter-by-time-comparison-operators.html 301 /openstack/cinder-specs/specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.html /openstack/cinder-specs/specs/newton/specify-volume_type-and-availability_zone-for-backup-restore-API.html 301 /openstack/cinder-specs/specs/wallaby/specify-volume_type-and-availability_zone-for-backup-restore-API.html +/openstack/cinder-specs/specs/wallaby/reset-state-robustification.rst 301 /openstack/cinder-specs/specs/xena/reset-state-robustification.rst +/openstack/cinder-specs/specs/wallaby/sizing-encrypted-volumes.rst 301 /openstack/cinder-specs/specs/xena/sizing-encrypted-volumes.rst diff --git a/specs/wallaby/nvme-agent.rst b/specs/wallaby/nvme-agent.rst index ab73140c..a940ce01 100644 --- a/specs/wallaby/nvme-agent.rst +++ b/specs/wallaby/nvme-agent.rst @@ -14,6 +14,9 @@ Daemon that monitors NVMe connections and MDRAID arrays created by the NVMe connector, identifies faulted volume replicas, requests new replicas and replaces faulted replicas with new ones. +.. note:: + This spec has been superseded by :doc:`../xena/nvme-agent`. + Problem description =================== diff --git a/specs/wallaby/image-encryption.rst b/specs/xena/image-encryption.rst similarity index 100% rename from specs/wallaby/image-encryption.rst rename to specs/xena/image-encryption.rst diff --git a/specs/wallaby/reset-state-robustification.rst b/specs/xena/reset-state-robustification.rst similarity index 100% rename from specs/wallaby/reset-state-robustification.rst rename to specs/xena/reset-state-robustification.rst diff --git a/specs/wallaby/sizing-encrypted-volumes.rst b/specs/xena/sizing-encrypted-volumes.rst similarity index 100% rename from specs/wallaby/sizing-encrypted-volumes.rst rename to specs/xena/sizing-encrypted-volumes.rst