docs: Remove unnecessary 'blockstorage-' prefix

These are in the cinder doc tree so of course they're block
storage-related.

Change-Id: Ic1950ff89021a89de397619eef17f8100eb3d847
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

doc/source/_extra/.htaccess

@@ -1,2 +1,4 @@
 redirectmatch 301 ^/cinder/([^/]+)/man/cinder-manage.html$ /cinder/$1/cli/cinder-manage.html
 redirectmatch 301 ^/cinder/([^/]+)/upgrade.html$ /cinder/$1/admin/upgrades.html
+redirectmatch 301 ^/cinder/([^/]+)/admin/blockstorage-([^/]+).html$ /cinder/$1/admin/$2.html
+redirectmatch 301 ^/cinder/([^/]+)/admin/generalized_filters.html$ /cinder/$1/admin/generalized-filters.html

doc/source/admin/README.rst

@@ -12,5 +12,3 @@ admin-guide section of openstack-manuals.
 The full spec for organization of documentation may be seen in the
 `OS Manuals Migration Spec
 <https://specs.openstack.org/openstack/docs-specs/specs/pike/os-manuals-migration.html>`.
-
-

doc/source/admin/index.rst

@@ -24,35 +24,35 @@ Amazon EC2 Elastic Block Storage (EBS) offering.
 .. toctree::
    :maxdepth: 1
 
-   blockstorage-security.rst
+   security
-   blockstorage-accelerate-image-compression.rst
+   accelerate-image-compression
-   blockstorage-api-throughput.rst
+   api-throughput
-   blockstorage-manage-volumes.rst
+   manage-volumes
-   blockstorage-troubleshoot.rst
+   troubleshoot
-   blockstorage-availability-zone-type.rst
+   availability-zone-type
-   generalized_filters.rst
+   generalized-filters
-   blockstorage-backup-disks.rst
+   backup-disks
-   blockstorage-boot-from-volume.rst
+   boot-from-volume
-   blockstorage-basic-volume-qos.rst
+   basic-volume-qos
-   blockstorage-capacity-based-qos.rst
+   capacity-based-qos
-   blockstorage-consistency-groups.rst
+   consistency-groups
-   blockstorage-driver-filter-weighing.rst
+   driver-filter-weighing
-   blockstorage-get-capabilities.rst
+   get-capabilities
-   blockstorage-user-visible-extra-specs.rst
+   user-visible-extra-specs
-   blockstorage-groups.rst
+   groups
-   blockstorage-image-volume-cache.rst
+   image-volume-cache
-   blockstorage-lio-iscsi-support.rst
+   lio-iscsi-support
-   blockstorage-multi-backend.rst
+   multi-backend
-   blockstorage-nfs-backend.rst
+   nfs-backend
-   blockstorage-over-subscription.rst
+   over-subscription
-   blockstorage-ratelimit-volume-copy-bandwidth.rst
+   ratelimit-volume-copy-bandwidth
-   blockstorage-volume-backed-image.rst
+   volume-backed-image
-   blockstorage-volume-backups-export-import.rst
+   volume-backups-export-import
-   blockstorage-volume-backups.rst
+   volume-backups
-   blockstorage-volume-migration.rst
+   volume-migration
-   blockstorage-volume-multiattach.rst
+   volume-multiattach
-   blockstorage-volume-number-weigher.rst
+   volume-number-weigher
-   blockstorage-default-volume-types.rst
+   default-volume-types
    api-configuration
    upgrades
 

doc/source/admin/manage-volumes.rst

@@ -50,25 +50,25 @@ troubleshoot your installation and back up your Compute volumes.
 
 .. toctree::
 
-   blockstorage-boot-from-volume.rst
+   boot-from-volume
-   blockstorage-nfs-backend.rst
+   nfs-backend
-   blockstorage-multi-backend.rst
+   multi-backend
-   blockstorage-backup-disks.rst
+   backup-disks
-   blockstorage-volume-migration.rst
+   volume-migration
-   blockstorage-volume-backups.rst
+   volume-backups
-   blockstorage-volume-backups-export-import.rst
+   volume-backups-export-import
-   blockstorage-lio-iscsi-support.rst
+   lio-iscsi-support
-   blockstorage-volume-number-weigher.rst
+   volume-number-weigher
-   blockstorage-capacity-based-qos.rst
+   capacity-based-qos
-   blockstorage-consistency-groups.rst
+   consistency-groups
-   blockstorage-driver-filter-weighing.rst
+   driver-filter-weighing
-   blockstorage-ratelimit-volume-copy-bandwidth.rst
+   ratelimit-volume-copy-bandwidth
-   blockstorage-over-subscription.rst
+   over-subscription
-   blockstorage-image-volume-cache.rst
+   image-volume-cache
-   blockstorage-volume-backed-image.rst
+   volume-backed-image
-   blockstorage-get-capabilities.rst
+   get-capabilities
-   blockstorage-user-visible-extra-specs.rst
+   user-visible-extra-specs
-   blockstorage-groups.rst
+   groups
 
 .. note::
 

doc/source/configuration/block-storage/drivers/dell-emc-powermax-driver.rst

@@ -3243,15 +3243,15 @@ following the setup instructions above, are supported with a few exceptions:
 .. Document Hyperlinks
 .. _Dell EMC Support: https://www.dell.com/support
 .. _Openstack CLI: https://docs.openstack.org/cinder/latest/cli/cli-manage-volumes.html#volume-types
-.. _over-subscription documentation: https://docs.openstack.org/cinder/latest/admin/blockstorage-over-subscription.html
+.. _over-subscription documentation: https://docs.openstack.org/cinder/latest/admin/over-subscription.html
 .. _configuring migrations: https://docs.openstack.org/nova/latest/admin/configuring-migrations.html
 .. _live migration usage: https://docs.openstack.org/nova/latest/admin/live-migration-usage.html
 .. _Ubuntu NFS Documentation: https://help.ubuntu.com/lts/serverguide/network-file-system.html
-.. _multi-attach documentation: https://docs.openstack.org/cinder/latest/admin/blockstorage-volume-multiattach.html
+.. _multi-attach documentation: https://docs.openstack.org/cinder/latest/admin/volume-multiattach.html
 .. _Data at Rest Encryption: https://www.dellemc.com/resources/en-us/asset/white-papers/products/storage/h13936-dell-emc-powermax-vmax-all-flash-data-rest-encryption.pdf
 .. _official Barbican documentation: https://docs.openstack.org/cinder/latest/configuration/block-storage/volume-encryption.html
 .. _SRDF Metro Overview & Best Practices: https://www.emc.com/collateral/technical-documentation/h14556-vmax3-srdf-metro-overview-and-best-practices-tech-note.pdf
-.. _block-storage groups: https://docs.openstack.org/cinder/latest/admin/blockstorage-groups.html
+.. _block-storage groups: https://docs.openstack.org/cinder/latest/admin/groups.html
 .. _volume backup: https://docs.openstack.org/cinder/latest/configuration/block-storage/backup-drivers.html
 .. _volume backup CLI: https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/volume-backup.html
 .. _PyU4V: https://pyu4v.readthedocs.io/en/latest/

doc/source/configuration/block-storage/drivers/dell-emc-unity-driver.rst

@@ -460,7 +460,7 @@ snapshots, the volume type extra specs would also have the following entry:
 
     {'consistent_group_snapshot_enabled': <is> True}
 
-Refer to :doc:`/admin/blockstorage-groups`
+Refer to :doc:`/admin/groups`
 for command lines detail.
 
 Volume replications

doc/source/configuration/block-storage/drivers/dell-emc-vnx-driver.rst

@@ -181,7 +181,7 @@ The value of the option ``storage_protocol`` can be either ``fc`` or ``iscsi``,
 which is case insensitive.
 
 For more details on multiple back ends, see :doc:`Configure multiple-storage
-back ends </admin/blockstorage-multi-backend>`.
+back ends </admin/multi-backend>`.
 
 Required configurations
 -----------------------

doc/source/configuration/block-storage/drivers/kaminario-driver.rst

@@ -189,7 +189,7 @@ The following steps are required to configure multiple K2 iSCSI/FC backends:
    ``Configure single Kaminario iSCSI/FC back end``
 
    See :doc:`Configure multiple-storage back ends
-   </admin/blockstorage-multi-backend>` for additional information.
+   </admin/multi-backend>` for additional information.
 
 #. Restart the cinder volume service for the changes to take effect.
 

doc/source/contributor/groups.rst

@@ -8,7 +8,7 @@ Generic volume group support was added in cinder in the Newton release.
 There is support for creating group types and group specs, creating
 groups of volumes, and creating snapshots of groups. Detailed information
 on how to create a group type, a group, and a group snapshot can be found
-in :doc:`block storage admin guide </admin/blockstorage-groups>`.
+in :doc:`block storage admin guide </admin/groups>`.
 
 How is generic volume groups different from consistency groups in cinder?
 The consistency group feature was introduced in cinder in Juno and are

doc/source/user/README.rst

@@ -13,4 +13,3 @@ administrative actions should go into 'doc/source/admin'.
 The full spec for organization of documentation may be seen in the
 `OS Manuals Migration Spec
 <https://specs.openstack.org/openstack/docs-specs/specs/pike/os-manuals-migration.html>`.
-

doc/test/redirect-tests.txt

@@ -1,2 +1,30 @@
 /cinder/latest/man/cinder-manage.html 301 /cinder/latest/cli/cinder-manage.html
 /cinder/latest/upgrade.html 301 /cinder/latest/admin/upgrades.html
+/cinder/latest/admin/blockstorage-accelerate-image-compression.html 301 /cinder/latest/admin/accelerate-image-compression.html
+/cinder/latest/admin/blockstorage-api-throughput.html 301 /cinder/latest/admin/api-throughput.html
+/cinder/latest/admin/blockstorage-availability-zone-type.html 301 /cinder/latest/admin/availability-zone-type.html
+/cinder/latest/admin/blockstorage-backup-disks.html 301 /cinder/latest/admin/backup-disks.html
+/cinder/latest/admin/blockstorage-basic-volume-qos.html 301 /cinder/latest/admin/basic-volume-qos.html
+/cinder/latest/admin/blockstorage-boot-from-volume.html 301 /cinder/latest/admin/boot-from-volume.html
+/cinder/latest/admin/blockstorage-capacity-based-qos.html 301 /cinder/latest/admin/capacity-based-qos.html
+/cinder/latest/admin/blockstorage-consistency-groups.html 301 /cinder/latest/admin/consistency-groups.html
+/cinder/latest/admin/blockstorage-driver-filter-weighing.html 301 /cinder/latest/admin/driver-filter-weighing.html
+/cinder/latest/admin/blockstorage-get-capabilities.html 301 /cinder/latest/admin/get-capabilities.html
+/cinder/latest/admin/blockstorage-groups.html 301 /cinder/latest/admin/groups.html
+/cinder/latest/admin/blockstorage-image-volume-cache.html 301 /cinder/latest/admin/image-volume-cache.html
+/cinder/latest/admin/blockstorage-lio-iscsi-support.html 301 /cinder/latest/admin/lio-iscsi-support.html
+/cinder/latest/admin/blockstorage-manage-volumes.html 301 /cinder/latest/admin/manage-volumes.html
+/cinder/latest/admin/blockstorage-multi-backend.html 301 /cinder/latest/admin/multi-backend.html
+/cinder/latest/admin/blockstorage-nfs-backend.html 301 /cinder/latest/admin/nfs-backend.html
+/cinder/latest/admin/blockstorage-over-subscription.html 301 /cinder/latest/admin/over-subscription.html
+/cinder/latest/admin/blockstorage-ratelimit-volume-copy-bandwidth.html 301 /cinder/latest/admin/ratelimit-volume-copy-bandwidth.html
+/cinder/latest/admin/blockstorage-security.html 301 /cinder/latest/admin/security.html
+/cinder/latest/admin/blockstorage-troubleshoot.html 301 /cinder/latest/admin/troubleshoot.html
+/cinder/latest/admin/blockstorage-user-visible-extra-specs.html 301 /cinder/latest/admin/user-visible-extra-specs.html
+/cinder/latest/admin/blockstorage-volume-backed-image.html 301 /cinder/latest/admin/volume-backed-image.html
+/cinder/latest/admin/blockstorage-volume-backups-export-import.html 301 /cinder/latest/admin/volume-backups-export-import.html
+/cinder/latest/admin/blockstorage-volume-backups.html 301 /cinder/latest/admin/volume-backups.html
+/cinder/latest/admin/blockstorage-volume-migration.html 301 /cinder/latest/admin/volume-migration.html
+/cinder/latest/admin/blockstorage-volume-multiattach.html 301 /cinder/latest/admin/volume-multiattach.html
+/cinder/latest/admin/blockstorage-volume-number-weigher.html 301 /cinder/latest/admin/volume-number-weigher.html
+/cinder/latest/admin/generalized_filters.html 301 /cinder/latest/admin/generalized-filters.html

tox.ini

@@ -226,5 +226,5 @@ extension =
 paths = ./cinder/tests/hacking
 
 [doc8]
-ignore-path=.tox,*.egg-info,doc/src/api,doc/source/drivers.rst,doc/build,.eggs/*/EGG-INFO/*.txt,doc/source/configuration/tables,./*.txt,releasenotes,doc/source/contributor/api
+ignore-path=.tox,*.egg-info,doc/src/api,doc/source/drivers.rst,doc/build,.eggs/*/EGG-INFO/*.txt,doc/source/configuration/tables,./*.txt,releasenotes,doc/source/contributor/api,doc/test
 extension=.txt,.rst,.inc