From 986a6a015f43739a7f13c7eb54e5fe0c9f4dccc9 Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Fri, 4 Aug 2017 15:33:52 -0500 Subject: [PATCH] [DOC BLD FIX] Name files for inclusion properly The Sphinx build was issuing hundreds of warning for duplicate labels. The reason for this was because all of the tables we had were named as .rst files. This would cause Sphinx to process them twice and it would think there were duplicated sections. There were two ways this could be handled: 1) Exclude the tables directory from the docs build. 2) Name the files as they should have always been so they weren't build twice. Given that option 1 just masked the problem, I am implementing this patch using option 2. So, all the tables we are including in our documentation have been named from .rst to .inc and the .. include:: directives that use them have also been updated to use the new file name. Change-Id: If395eb652f7e3b789bcbd5e6d6d05954c23d8d8a --- .../backup/ceph-backup-driver.rst | 2 +- .../backup/gcs-backup-driver.rst | 2 +- .../backup/glusterfs-backup-driver.rst | 2 +- .../backup/nfs-backup-driver.rst | 2 +- .../backup/posix-backup-driver.rst | 2 +- .../backup/swift-backup-driver.rst | 2 +- .../backup/tsm-backup-driver.rst | 2 +- .../block-storage/config-options.rst | 58 +++++++++---------- .../drivers/blockbridge-eps-driver.rst | 2 +- .../drivers/ceph-rbd-volume-driver.rst | 2 +- .../drivers/cloudbyte-driver.rst | 2 +- .../drivers/coho-data-driver.rst | 2 +- .../block-storage/drivers/coprhd-driver.rst | 2 +- .../drivers/datera-volume-driver.rst | 2 +- .../drivers/dell-emc-scaleio-driver.rst | 2 +- .../drivers/dell-emc-unity-driver.rst | 2 +- .../drivers/dell-equallogic-driver.rst | 2 +- .../drivers/dell-storagecenter-driver.rst | 2 +- .../block-storage/drivers/dothill-driver.rst | 2 +- .../drivers/emc-xtremio-driver.rst | 2 +- .../drivers/falconstor-fss-driver.rst | 2 +- .../drivers/hitachi-storage-volume-driver.rst | 2 +- .../block-storage/drivers/hp-msa-driver.rst | 2 +- .../block-storage/drivers/hpe-3par-driver.rst | 2 +- .../drivers/ibm-gpfs-volume-driver.rst | 6 +- .../drivers/ibm-storage-volume-driver.rst | 2 +- .../drivers/ibm-storwize-svc-driver.rst | 2 +- .../drivers/infinidat-volume-driver.rst | 2 +- .../drivers/infortrend-volume-driver.rst | 2 +- .../drivers/itri-disco-driver.rst | 2 +- .../drivers/kaminario-driver.rst | 2 +- .../block-storage/drivers/lenovo-driver.rst | 2 +- .../drivers/lvm-volume-driver.rst | 2 +- .../drivers/nec-storage-m-series-driver.rst | 2 +- .../drivers/netapp-volume-driver.rst | 12 ++-- .../drivers/nexentaedge-driver.rst | 2 +- .../drivers/nexentastor4-driver.rst | 2 +- .../drivers/nexentastor5-driver.rst | 2 +- .../drivers/nfs-volume-driver.rst | 2 +- .../drivers/nimble-volume-driver.rst | 2 +- .../drivers/prophetstor-dpl-driver.rst | 2 +- .../block-storage/drivers/quobyte-driver.rst | 2 +- .../drivers/scality-sofs-driver.rst | 2 +- .../block-storage/drivers/sheepdog-driver.rst | 2 +- .../drivers/smbfs-volume-driver.rst | 2 +- .../drivers/solidfire-volume-driver.rst | 2 +- .../drivers/synology-dsm-driver.rst | 2 +- .../drivers/tintri-volume-driver.rst | 2 +- .../drivers/vmware-vmdk-driver.rst | 2 +- .../drivers/vzstorage-driver.rst | 2 +- .../drivers/windows-iscsi-volume-driver.rst | 2 +- .../drivers/xio-volume-driver.rst | 2 +- .../drivers/zadara-volume-driver.rst | 2 +- .../drivers/zfssa-iscsi-driver.rst | 2 +- .../drivers/zfssa-nfs-driver.rst | 2 +- .../drivers/zte-storage-driver.rst | 2 +- .../configuration/block-storage/fc-zoning.rst | 10 ++-- .../tables/{cinder-api.rst => cinder-api.inc} | 0 .../{cinder-auth.rst => cinder-auth.inc} | 0 ...{cinder-backups.rst => cinder-backups.inc} | 0 ...ckups_ceph.rst => cinder-backups_ceph.inc} | 0 ...backups_gcs.rst => cinder-backups_gcs.inc} | 0 ...terfs.rst => cinder-backups_glusterfs.inc} | 0 ...backups_nfs.rst => cinder-backups_nfs.inc} | 0 ...ups_posix.rst => cinder-backups_posix.inc} | 0 ...ups_swift.rst => cinder-backups_swift.inc} | 0 ...backups_tsm.rst => cinder-backups_tsm.inc} | 0 ...ock-device.rst => cinder-block-device.inc} | 0 ...blockbridge.rst => cinder-blockbridge.inc} | 0 ...der-cloudbyte.rst => cinder-cloudbyte.inc} | 0 .../{cinder-coho.rst => cinder-coho.inc} | 0 .../{cinder-common.rst => cinder-common.inc} | 0 ...{cinder-compute.rst => cinder-compute.inc} | 0 ...ordination.rst => cinder-coordination.inc} | 0 .../{cinder-coprhd.rst => cinder-coprhd.inc} | 0 .../{cinder-datera.rst => cinder-datera.inc} | 0 .../{cinder-debug.rst => cinder-debug.inc} | 0 ...mc_unity.rst => cinder-dell_emc_unity.inc} | 0 .../{cinder-dellsc.rst => cinder-dellsc.inc} | 0 .../{cinder-disco.rst => cinder-disco.inc} | 0 ...{cinder-dothill.rst => cinder-dothill.inc} | 0 .../{cinder-drbd.rst => cinder-drbd.inc} | 0 .../tables/{cinder-emc.rst => cinder-emc.inc} | 0 ...{cinder-emc_sio.rst => cinder-emc_sio.inc} | 0 ...emc_xtremio.rst => cinder-emc_xtremio.inc} | 0 .../{cinder-eqlx.rst => cinder-eqlx.inc} | 0 ...{cinder-eternus.rst => cinder-eternus.inc} | 0 ...r-falconstor.rst => cinder-falconstor.inc} | 0 ...flashsystem.rst => cinder-flashsystem.inc} | 0 ...inder-fusionio.rst => cinder-fusionio.inc} | 0 .../{cinder-hgst.rst => cinder-hgst.inc} | 0 ...tachi-hbsd.rst => cinder-hitachi-hbsd.inc} | 0 ...tachi-hnas.rst => cinder-hitachi-hnas.inc} | 0 ...hitachi-vsp.rst => cinder-hitachi-vsp.inc} | 0 ...{cinder-hpe3par.rst => cinder-hpe3par.inc} | 0 ...hpelefthand.rst => cinder-hpelefthand.inc} | 0 .../{cinder-hpexp.rst => cinder-hpexp.inc} | 0 .../{cinder-hpmsa.rst => cinder-hpmsa.inc} | 0 .../{cinder-huawei.rst => cinder-huawei.inc} | 0 .../{cinder-hyperv.rst => cinder-hyperv.inc} | 0 ...inder-ibm_gpfs.rst => cinder-ibm_gpfs.inc} | 0 ...m_gpfs_nfs.rst => cinder-ibm_gpfs_nfs.inc} | 0 ..._remote.rst => cinder-ibm_gpfs_remote.inc} | 0 ...ibm_storage.rst => cinder-ibm_storage.inc} | 0 .../{cinder-images.rst => cinder-images.inc} | 0 ...der-infinidat.rst => cinder-infinidat.inc} | 0 ...r-infortrend.rst => cinder-infortrend.inc} | 0 ...der-kaminario.rst => cinder-kaminario.inc} | 0 .../{cinder-lenovo.rst => cinder-lenovo.inc} | 0 .../tables/{cinder-lvm.rst => cinder-lvm.inc} | 0 .../tables/{cinder-nas.rst => cinder-nas.inc} | 0 .../{cinder-nec_m.rst => cinder-nec_m.inc} | 0 ...scsi.rst => cinder-netapp_7mode_iscsi.inc} | 0 ...de_nfs.rst => cinder-netapp_7mode_nfs.inc} | 0 ...iscsi.rst => cinder-netapp_cdot_iscsi.inc} | 0 ...dot_nfs.rst => cinder-netapp_cdot_nfs.inc} | 0 ...si.rst => cinder-netapp_eseries_iscsi.inc} | 0 ...{cinder-nexenta.rst => cinder-nexenta.inc} | 0 ...inder-nexenta5.rst => cinder-nexenta5.inc} | 0 ...xenta_edge.rst => cinder-nexenta_edge.inc} | 0 .../{cinder-nimble.rst => cinder-nimble.inc} | 0 ...{cinder-osbrick.rst => cinder-osbrick.inc} | 0 ...inder-profiler.rst => cinder-profiler.inc} | 0 ...tor_dpl.rst => cinder-prophetstor_dpl.inc} | 0 .../{cinder-pure.rst => cinder-pure.inc} | 0 .../{cinder-qnap.rst => cinder-qnap.inc} | 0 ...{cinder-quobyte.rst => cinder-quobyte.inc} | 0 .../{cinder-quota.rst => cinder-quota.inc} | 0 .../{cinder-redis.rst => cinder-redis.inc} | 0 .../tables/{cinder-san.rst => cinder-san.inc} | 0 ...{cinder-scality.rst => cinder-scality.inc} | 0 ...der-scheduler.rst => cinder-scheduler.inc} | 0 .../{cinder-scst.rst => cinder-scst.inc} | 0 ...inder-sheepdog.rst => cinder-sheepdog.inc} | 0 .../{cinder-smbfs.rst => cinder-smbfs.inc} | 0 ...der-solidfire.rst => cinder-solidfire.inc} | 0 ...{cinder-storage.rst => cinder-storage.inc} | 0 ...orage_ceph.rst => cinder-storage_ceph.inc} | 0 ...orage_gpfs.rst => cinder-storage_gpfs.inc} | 0 ...storage_nfs.rst => cinder-storage_nfs.inc} | 0 ...inder-storwize.rst => cinder-storwize.inc} | 0 .../{cinder-swift.rst => cinder-swift.inc} | 0 ...inder-synology.rst => cinder-synology.inc} | 0 .../{cinder-tegile.rst => cinder-tegile.inc} | 0 .../{cinder-tintri.rst => cinder-tintri.inc} | 0 .../{cinder-violin.rst => cinder-violin.inc} | 0 .../{cinder-vmware.rst => cinder-vmware.inc} | 0 ...der-vzstorage.rst => cinder-vzstorage.inc} | 0 ...{cinder-windows.rst => cinder-windows.inc} | 0 .../tables/{cinder-xio.rst => cinder-xio.inc} | 0 .../{cinder-zadara.rst => cinder-zadara.inc} | 0 ...zfssa-iscsi.rst => cinder-zfssa-iscsi.inc} | 0 ...der-zfssa-nfs.rst => cinder-zfssa-nfs.inc} | 0 .../{cinder-zones.rst => cinder-zones.inc} | 0 .../{cinder-zoning.rst => cinder-zoning.inc} | 0 ...brcd.rst => cinder-zoning_fabric_brcd.inc} | 0 ...sco.rst => cinder-zoning_fabric_cisco.inc} | 0 ...rcd.rst => cinder-zoning_manager_brcd.inc} | 0 ...co.rst => cinder-zoning_manager_cisco.inc} | 0 .../tables/{cinder-zte.rst => cinder-zte.inc} | 0 ....rst => cinder-netapp_cdot_extraspecs.inc} | 0 161 files changed, 96 insertions(+), 96 deletions(-) rename doc/source/configuration/tables/{cinder-api.rst => cinder-api.inc} (100%) rename doc/source/configuration/tables/{cinder-auth.rst => cinder-auth.inc} (100%) rename doc/source/configuration/tables/{cinder-backups.rst => cinder-backups.inc} (100%) rename doc/source/configuration/tables/{cinder-backups_ceph.rst => cinder-backups_ceph.inc} (100%) rename doc/source/configuration/tables/{cinder-backups_gcs.rst => cinder-backups_gcs.inc} (100%) rename doc/source/configuration/tables/{cinder-backups_glusterfs.rst => cinder-backups_glusterfs.inc} (100%) rename doc/source/configuration/tables/{cinder-backups_nfs.rst => cinder-backups_nfs.inc} (100%) rename doc/source/configuration/tables/{cinder-backups_posix.rst => cinder-backups_posix.inc} (100%) rename doc/source/configuration/tables/{cinder-backups_swift.rst => cinder-backups_swift.inc} (100%) rename doc/source/configuration/tables/{cinder-backups_tsm.rst => cinder-backups_tsm.inc} (100%) rename doc/source/configuration/tables/{cinder-block-device.rst => cinder-block-device.inc} (100%) rename doc/source/configuration/tables/{cinder-blockbridge.rst => cinder-blockbridge.inc} (100%) rename doc/source/configuration/tables/{cinder-cloudbyte.rst => cinder-cloudbyte.inc} (100%) rename doc/source/configuration/tables/{cinder-coho.rst => cinder-coho.inc} (100%) rename doc/source/configuration/tables/{cinder-common.rst => cinder-common.inc} (100%) rename doc/source/configuration/tables/{cinder-compute.rst => cinder-compute.inc} (100%) rename doc/source/configuration/tables/{cinder-coordination.rst => cinder-coordination.inc} (100%) rename doc/source/configuration/tables/{cinder-coprhd.rst => cinder-coprhd.inc} (100%) rename doc/source/configuration/tables/{cinder-datera.rst => cinder-datera.inc} (100%) rename doc/source/configuration/tables/{cinder-debug.rst => cinder-debug.inc} (100%) rename doc/source/configuration/tables/{cinder-dell_emc_unity.rst => cinder-dell_emc_unity.inc} (100%) rename doc/source/configuration/tables/{cinder-dellsc.rst => cinder-dellsc.inc} (100%) rename doc/source/configuration/tables/{cinder-disco.rst => cinder-disco.inc} (100%) rename doc/source/configuration/tables/{cinder-dothill.rst => cinder-dothill.inc} (100%) rename doc/source/configuration/tables/{cinder-drbd.rst => cinder-drbd.inc} (100%) rename doc/source/configuration/tables/{cinder-emc.rst => cinder-emc.inc} (100%) rename doc/source/configuration/tables/{cinder-emc_sio.rst => cinder-emc_sio.inc} (100%) rename doc/source/configuration/tables/{cinder-emc_xtremio.rst => cinder-emc_xtremio.inc} (100%) rename doc/source/configuration/tables/{cinder-eqlx.rst => cinder-eqlx.inc} (100%) rename doc/source/configuration/tables/{cinder-eternus.rst => cinder-eternus.inc} (100%) rename doc/source/configuration/tables/{cinder-falconstor.rst => cinder-falconstor.inc} (100%) rename doc/source/configuration/tables/{cinder-flashsystem.rst => cinder-flashsystem.inc} (100%) rename doc/source/configuration/tables/{cinder-fusionio.rst => cinder-fusionio.inc} (100%) rename doc/source/configuration/tables/{cinder-hgst.rst => cinder-hgst.inc} (100%) rename doc/source/configuration/tables/{cinder-hitachi-hbsd.rst => cinder-hitachi-hbsd.inc} (100%) rename doc/source/configuration/tables/{cinder-hitachi-hnas.rst => cinder-hitachi-hnas.inc} (100%) rename doc/source/configuration/tables/{cinder-hitachi-vsp.rst => cinder-hitachi-vsp.inc} (100%) rename doc/source/configuration/tables/{cinder-hpe3par.rst => cinder-hpe3par.inc} (100%) rename doc/source/configuration/tables/{cinder-hpelefthand.rst => cinder-hpelefthand.inc} (100%) rename doc/source/configuration/tables/{cinder-hpexp.rst => cinder-hpexp.inc} (100%) rename doc/source/configuration/tables/{cinder-hpmsa.rst => cinder-hpmsa.inc} (100%) rename doc/source/configuration/tables/{cinder-huawei.rst => cinder-huawei.inc} (100%) rename doc/source/configuration/tables/{cinder-hyperv.rst => cinder-hyperv.inc} (100%) rename doc/source/configuration/tables/{cinder-ibm_gpfs.rst => cinder-ibm_gpfs.inc} (100%) rename doc/source/configuration/tables/{cinder-ibm_gpfs_nfs.rst => cinder-ibm_gpfs_nfs.inc} (100%) rename doc/source/configuration/tables/{cinder-ibm_gpfs_remote.rst => cinder-ibm_gpfs_remote.inc} (100%) rename doc/source/configuration/tables/{cinder-ibm_storage.rst => cinder-ibm_storage.inc} (100%) rename doc/source/configuration/tables/{cinder-images.rst => cinder-images.inc} (100%) rename doc/source/configuration/tables/{cinder-infinidat.rst => cinder-infinidat.inc} (100%) rename doc/source/configuration/tables/{cinder-infortrend.rst => cinder-infortrend.inc} (100%) rename doc/source/configuration/tables/{cinder-kaminario.rst => cinder-kaminario.inc} (100%) rename doc/source/configuration/tables/{cinder-lenovo.rst => cinder-lenovo.inc} (100%) rename doc/source/configuration/tables/{cinder-lvm.rst => cinder-lvm.inc} (100%) rename doc/source/configuration/tables/{cinder-nas.rst => cinder-nas.inc} (100%) rename doc/source/configuration/tables/{cinder-nec_m.rst => cinder-nec_m.inc} (100%) rename doc/source/configuration/tables/{cinder-netapp_7mode_iscsi.rst => cinder-netapp_7mode_iscsi.inc} (100%) rename doc/source/configuration/tables/{cinder-netapp_7mode_nfs.rst => cinder-netapp_7mode_nfs.inc} (100%) rename doc/source/configuration/tables/{cinder-netapp_cdot_iscsi.rst => cinder-netapp_cdot_iscsi.inc} (100%) rename doc/source/configuration/tables/{cinder-netapp_cdot_nfs.rst => cinder-netapp_cdot_nfs.inc} (100%) rename doc/source/configuration/tables/{cinder-netapp_eseries_iscsi.rst => cinder-netapp_eseries_iscsi.inc} (100%) rename doc/source/configuration/tables/{cinder-nexenta.rst => cinder-nexenta.inc} (100%) rename doc/source/configuration/tables/{cinder-nexenta5.rst => cinder-nexenta5.inc} (100%) rename doc/source/configuration/tables/{cinder-nexenta_edge.rst => cinder-nexenta_edge.inc} (100%) rename doc/source/configuration/tables/{cinder-nimble.rst => cinder-nimble.inc} (100%) rename doc/source/configuration/tables/{cinder-osbrick.rst => cinder-osbrick.inc} (100%) rename doc/source/configuration/tables/{cinder-profiler.rst => cinder-profiler.inc} (100%) rename doc/source/configuration/tables/{cinder-prophetstor_dpl.rst => cinder-prophetstor_dpl.inc} (100%) rename doc/source/configuration/tables/{cinder-pure.rst => cinder-pure.inc} (100%) rename doc/source/configuration/tables/{cinder-qnap.rst => cinder-qnap.inc} (100%) rename doc/source/configuration/tables/{cinder-quobyte.rst => cinder-quobyte.inc} (100%) rename doc/source/configuration/tables/{cinder-quota.rst => cinder-quota.inc} (100%) rename doc/source/configuration/tables/{cinder-redis.rst => cinder-redis.inc} (100%) rename doc/source/configuration/tables/{cinder-san.rst => cinder-san.inc} (100%) rename doc/source/configuration/tables/{cinder-scality.rst => cinder-scality.inc} (100%) rename doc/source/configuration/tables/{cinder-scheduler.rst => cinder-scheduler.inc} (100%) rename doc/source/configuration/tables/{cinder-scst.rst => cinder-scst.inc} (100%) rename doc/source/configuration/tables/{cinder-sheepdog.rst => cinder-sheepdog.inc} (100%) rename doc/source/configuration/tables/{cinder-smbfs.rst => cinder-smbfs.inc} (100%) rename doc/source/configuration/tables/{cinder-solidfire.rst => cinder-solidfire.inc} (100%) rename doc/source/configuration/tables/{cinder-storage.rst => cinder-storage.inc} (100%) rename doc/source/configuration/tables/{cinder-storage_ceph.rst => cinder-storage_ceph.inc} (100%) rename doc/source/configuration/tables/{cinder-storage_gpfs.rst => cinder-storage_gpfs.inc} (100%) rename doc/source/configuration/tables/{cinder-storage_nfs.rst => cinder-storage_nfs.inc} (100%) rename doc/source/configuration/tables/{cinder-storwize.rst => cinder-storwize.inc} (100%) rename doc/source/configuration/tables/{cinder-swift.rst => cinder-swift.inc} (100%) rename doc/source/configuration/tables/{cinder-synology.rst => cinder-synology.inc} (100%) rename doc/source/configuration/tables/{cinder-tegile.rst => cinder-tegile.inc} (100%) rename doc/source/configuration/tables/{cinder-tintri.rst => cinder-tintri.inc} (100%) rename doc/source/configuration/tables/{cinder-violin.rst => cinder-violin.inc} (100%) rename doc/source/configuration/tables/{cinder-vmware.rst => cinder-vmware.inc} (100%) rename doc/source/configuration/tables/{cinder-vzstorage.rst => cinder-vzstorage.inc} (100%) rename doc/source/configuration/tables/{cinder-windows.rst => cinder-windows.inc} (100%) rename doc/source/configuration/tables/{cinder-xio.rst => cinder-xio.inc} (100%) rename doc/source/configuration/tables/{cinder-zadara.rst => cinder-zadara.inc} (100%) rename doc/source/configuration/tables/{cinder-zfssa-iscsi.rst => cinder-zfssa-iscsi.inc} (100%) rename doc/source/configuration/tables/{cinder-zfssa-nfs.rst => cinder-zfssa-nfs.inc} (100%) rename doc/source/configuration/tables/{cinder-zones.rst => cinder-zones.inc} (100%) rename doc/source/configuration/tables/{cinder-zoning.rst => cinder-zoning.inc} (100%) rename doc/source/configuration/tables/{cinder-zoning_fabric_brcd.rst => cinder-zoning_fabric_brcd.inc} (100%) rename doc/source/configuration/tables/{cinder-zoning_fabric_cisco.rst => cinder-zoning_fabric_cisco.inc} (100%) rename doc/source/configuration/tables/{cinder-zoning_manager_brcd.rst => cinder-zoning_manager_brcd.inc} (100%) rename doc/source/configuration/tables/{cinder-zoning_manager_cisco.rst => cinder-zoning_manager_cisco.inc} (100%) rename doc/source/configuration/tables/{cinder-zte.rst => cinder-zte.inc} (100%) rename doc/source/configuration/tables/manual/{cinder-netapp_cdot_extraspecs.rst => cinder-netapp_cdot_extraspecs.inc} (100%) diff --git a/doc/source/configuration/block-storage/backup/ceph-backup-driver.rst b/doc/source/configuration/block-storage/backup/ceph-backup-driver.rst index 44fa87d7ce4..50ba6dcb6b3 100644 --- a/doc/source/configuration/block-storage/backup/ceph-backup-driver.rst +++ b/doc/source/configuration/block-storage/backup/ceph-backup-driver.rst @@ -42,7 +42,7 @@ To enable the Ceph backup driver, include the following option in the The following configuration options are available for the Ceph backup driver. -.. include:: ../../tables/cinder-backups_ceph.rst +.. include:: ../../tables/cinder-backups_ceph.inc This example shows the default options for the Ceph backup driver. diff --git a/doc/source/configuration/block-storage/backup/gcs-backup-driver.rst b/doc/source/configuration/block-storage/backup/gcs-backup-driver.rst index ca6b96962c8..4eeae105a5e 100644 --- a/doc/source/configuration/block-storage/backup/gcs-backup-driver.rst +++ b/doc/source/configuration/block-storage/backup/gcs-backup-driver.rst @@ -15,4 +15,4 @@ To enable the GCS backup driver, include the following option in the The following configuration options are available for the GCS backup driver. -.. include:: ../../tables/cinder-backups_gcs.rst +.. include:: ../../tables/cinder-backups_gcs.inc diff --git a/doc/source/configuration/block-storage/backup/glusterfs-backup-driver.rst b/doc/source/configuration/block-storage/backup/glusterfs-backup-driver.rst index 9980702d67b..eeff3aaa02c 100644 --- a/doc/source/configuration/block-storage/backup/glusterfs-backup-driver.rst +++ b/doc/source/configuration/block-storage/backup/glusterfs-backup-driver.rst @@ -14,4 +14,4 @@ To enable the GlusterFS backup driver, include the following option in the The following configuration options are available for the GlusterFS backup driver. -.. include:: ../../tables/cinder-backups_glusterfs.rst +.. include:: ../../tables/cinder-backups_glusterfs.inc diff --git a/doc/source/configuration/block-storage/backup/nfs-backup-driver.rst b/doc/source/configuration/block-storage/backup/nfs-backup-driver.rst index bd6c19273ce..743ec0e3a62 100644 --- a/doc/source/configuration/block-storage/backup/nfs-backup-driver.rst +++ b/doc/source/configuration/block-storage/backup/nfs-backup-driver.rst @@ -15,4 +15,4 @@ To enable the NFS backup driver, include the following option in the The following configuration options are available for the NFS back-end backup driver. -.. include:: ../../tables/cinder-backups_nfs.rst +.. include:: ../../tables/cinder-backups_nfs.inc diff --git a/doc/source/configuration/block-storage/backup/posix-backup-driver.rst b/doc/source/configuration/block-storage/backup/posix-backup-driver.rst index 18dfd0b2868..f754cdbcdd3 100644 --- a/doc/source/configuration/block-storage/backup/posix-backup-driver.rst +++ b/doc/source/configuration/block-storage/backup/posix-backup-driver.rst @@ -15,4 +15,4 @@ option in the ``cinder.conf`` file: The following configuration options are available for the POSIX file systems backup driver. -.. include:: ../../tables/cinder-backups_posix.rst +.. include:: ../../tables/cinder-backups_posix.inc diff --git a/doc/source/configuration/block-storage/backup/swift-backup-driver.rst b/doc/source/configuration/block-storage/backup/swift-backup-driver.rst index 2a1cc03cbc9..1dae2b45f75 100644 --- a/doc/source/configuration/block-storage/backup/swift-backup-driver.rst +++ b/doc/source/configuration/block-storage/backup/swift-backup-driver.rst @@ -15,7 +15,7 @@ To enable the swift backup driver, include the following option in the The following configuration options are available for the Swift back-end backup driver. -.. include:: ../../tables/cinder-backups_swift.rst +.. include:: ../../tables/cinder-backups_swift.inc To enable the swift backup driver for 1.0, 2.0, or 3.0 authentication version, specify ``1``, ``2``, or ``3`` correspondingly. For example: diff --git a/doc/source/configuration/block-storage/backup/tsm-backup-driver.rst b/doc/source/configuration/block-storage/backup/tsm-backup-driver.rst index 1ab1294cfef..84529564ee3 100644 --- a/doc/source/configuration/block-storage/backup/tsm-backup-driver.rst +++ b/doc/source/configuration/block-storage/backup/tsm-backup-driver.rst @@ -20,7 +20,7 @@ To enable the IBM TSM backup driver, include the following option in The following configuration options are available for the TSM backup driver. -.. include:: ../../tables/cinder-backups_tsm.rst +.. include:: ../../tables/cinder-backups_tsm.inc This example shows the default options for the TSM backup driver. diff --git a/doc/source/configuration/block-storage/config-options.rst b/doc/source/configuration/block-storage/config-options.rst index ff2e5269d18..55c6060ab20 100644 --- a/doc/source/configuration/block-storage/config-options.rst +++ b/doc/source/configuration/block-storage/config-options.rst @@ -4,32 +4,32 @@ Additional options These options can also be set in the ``cinder.conf`` file. -.. include:: ../tables/cinder-api.rst -.. include:: ../tables/cinder-auth.rst -.. include:: ../tables/cinder-backups.rst -.. include:: ../tables/cinder-block-device.rst -.. include:: ../tables/cinder-common.rst -.. include:: ../tables/cinder-compute.rst -.. include:: ../tables/cinder-coordination.rst -.. include:: ../tables/cinder-debug.rst -.. include:: ../tables/cinder-drbd.rst -.. include:: ../tables/cinder-emc.rst -.. include:: ../tables/cinder-eternus.rst -.. include:: ../tables/cinder-flashsystem.rst -.. include:: ../tables/cinder-hgst.rst -.. include:: ../tables/cinder-hpelefthand.rst -.. include:: ../tables/cinder-hpexp.rst -.. include:: ../tables/cinder-huawei.rst -.. include:: ../tables/cinder-hyperv.rst -.. include:: ../tables/cinder-images.rst -.. include:: ../tables/cinder-nas.rst -.. include:: ../tables/cinder-profiler.rst -.. include:: ../tables/cinder-pure.rst -.. include:: ../tables/cinder-quota.rst -.. include:: ../tables/cinder-redis.rst -.. include:: ../tables/cinder-san.rst -.. include:: ../tables/cinder-scheduler.rst -.. include:: ../tables/cinder-scst.rst -.. include:: ../tables/cinder-storage.rst -.. include:: ../tables/cinder-tegile.rst -.. include:: ../tables/cinder-zones.rst +.. include:: ../tables/cinder-api.inc +.. include:: ../tables/cinder-auth.inc +.. include:: ../tables/cinder-backups.inc +.. include:: ../tables/cinder-block-device.inc +.. include:: ../tables/cinder-common.inc +.. include:: ../tables/cinder-compute.inc +.. include:: ../tables/cinder-coordination.inc +.. include:: ../tables/cinder-debug.inc +.. include:: ../tables/cinder-drbd.inc +.. include:: ../tables/cinder-emc.inc +.. include:: ../tables/cinder-eternus.inc +.. include:: ../tables/cinder-flashsystem.inc +.. include:: ../tables/cinder-hgst.inc +.. include:: ../tables/cinder-hpelefthand.inc +.. include:: ../tables/cinder-hpexp.inc +.. include:: ../tables/cinder-huawei.inc +.. include:: ../tables/cinder-hyperv.inc +.. include:: ../tables/cinder-images.inc +.. include:: ../tables/cinder-nas.inc +.. include:: ../tables/cinder-profiler.inc +.. include:: ../tables/cinder-pure.inc +.. include:: ../tables/cinder-quota.inc +.. include:: ../tables/cinder-redis.inc +.. include:: ../tables/cinder-san.inc +.. include:: ../tables/cinder-scheduler.inc +.. include:: ../tables/cinder-scst.inc +.. include:: ../tables/cinder-storage.inc +.. include:: ../tables/cinder-tegile.inc +.. include:: ../tables/cinder-zones.inc diff --git a/doc/source/configuration/block-storage/drivers/blockbridge-eps-driver.rst b/doc/source/configuration/block-storage/drivers/blockbridge-eps-driver.rst index 399486cf768..ac72ffc40f1 100644 --- a/doc/source/configuration/block-storage/drivers/blockbridge-eps-driver.rst +++ b/doc/source/configuration/block-storage/drivers/blockbridge-eps-driver.rst @@ -196,7 +196,7 @@ scheduling capabilities. Configuration options ~~~~~~~~~~~~~~~~~~~~~ -.. include:: ../../tables/cinder-blockbridge.rst +.. include:: ../../tables/cinder-blockbridge.inc .. _cg_configuration_example: diff --git a/doc/source/configuration/block-storage/drivers/ceph-rbd-volume-driver.rst b/doc/source/configuration/block-storage/drivers/ceph-rbd-volume-driver.rst index ef7517ead40..476973c5b27 100644 --- a/doc/source/configuration/block-storage/drivers/ceph-rbd-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/ceph-rbd-volume-driver.rst @@ -106,4 +106,4 @@ Ceph RADOS Block Device driver. The ``volume_tmp_dir`` option has been deprecated and replaced by ``image_conversion_dir``. -.. include:: ../../tables/cinder-storage_ceph.rst +.. include:: ../../tables/cinder-storage_ceph.inc diff --git a/doc/source/configuration/block-storage/drivers/cloudbyte-driver.rst b/doc/source/configuration/block-storage/drivers/cloudbyte-driver.rst index da453a085e4..61e4025869d 100644 --- a/doc/source/configuration/block-storage/drivers/cloudbyte-driver.rst +++ b/doc/source/configuration/block-storage/drivers/cloudbyte-driver.rst @@ -5,4 +5,4 @@ CloudByte volume driver CloudByte Block Storage driver configuration ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. include:: ../../tables/cinder-cloudbyte.rst +.. include:: ../../tables/cinder-cloudbyte.inc diff --git a/doc/source/configuration/block-storage/drivers/coho-data-driver.rst b/doc/source/configuration/block-storage/drivers/coho-data-driver.rst index 4fad81f6cab..702c30dc8f3 100644 --- a/doc/source/configuration/block-storage/drivers/coho-data-driver.rst +++ b/doc/source/configuration/block-storage/drivers/coho-data-driver.rst @@ -90,4 +90,4 @@ Coho Data Block Storage driver configuration #. Restart the ``cinder-volume`` service to enable Coho Data driver. -.. include:: ../../tables/cinder-coho.rst +.. include:: ../../tables/cinder-coho.inc diff --git a/doc/source/configuration/block-storage/drivers/coprhd-driver.rst b/doc/source/configuration/block-storage/drivers/coprhd-driver.rst index a1e7ad78854..c9d8139e671 100644 --- a/doc/source/configuration/block-storage/drivers/coprhd-driver.rst +++ b/doc/source/configuration/block-storage/drivers/coprhd-driver.rst @@ -45,7 +45,7 @@ Driver options The following table contains the configuration options specific to the CoprHD volume driver. -.. include:: ../../tables/cinder-coprhd.rst +.. include:: ../../tables/cinder-coprhd.inc Preparation diff --git a/doc/source/configuration/block-storage/drivers/datera-volume-driver.rst b/doc/source/configuration/block-storage/drivers/datera-volume-driver.rst index b32eabd3bf0..ebc9d541869 100644 --- a/doc/source/configuration/block-storage/drivers/datera-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/datera-volume-driver.rst @@ -32,7 +32,7 @@ Prerequisites * open-iscsi-utils * wget -.. include:: ../../tables/cinder-datera.rst +.. include:: ../../tables/cinder-datera.inc diff --git a/doc/source/configuration/block-storage/drivers/dell-emc-scaleio-driver.rst b/doc/source/configuration/block-storage/drivers/dell-emc-scaleio-driver.rst index ee81ef1856c..484d1c14794 100644 --- a/doc/source/configuration/block-storage/drivers/dell-emc-scaleio-driver.rst +++ b/doc/source/configuration/block-storage/drivers/dell-emc-scaleio-driver.rst @@ -278,4 +278,4 @@ Configuration options The ScaleIO driver supports these configuration options: -.. include:: ../../tables/cinder-emc_sio.rst +.. include:: ../../tables/cinder-emc_sio.inc diff --git a/doc/source/configuration/block-storage/drivers/dell-emc-unity-driver.rst b/doc/source/configuration/block-storage/drivers/dell-emc-unity-driver.rst index fc1d02c0d02..104d6a27f6c 100644 --- a/doc/source/configuration/block-storage/drivers/dell-emc-unity-driver.rst +++ b/doc/source/configuration/block-storage/drivers/dell-emc-unity-driver.rst @@ -159,7 +159,7 @@ Driver configuration Driver options ~~~~~~~~~~~~~~ -.. include:: ../../tables/cinder-dell_emc_unity.rst +.. include:: ../../tables/cinder-dell_emc_unity.inc FC or iSCSI ports option ------------------------ diff --git a/doc/source/configuration/block-storage/drivers/dell-equallogic-driver.rst b/doc/source/configuration/block-storage/drivers/dell-equallogic-driver.rst index 15167852cee..d94895782d1 100644 --- a/doc/source/configuration/block-storage/drivers/dell-equallogic-driver.rst +++ b/doc/source/configuration/block-storage/drivers/dell-equallogic-driver.rst @@ -28,7 +28,7 @@ dependent upon the generic block storage driver's SSH settings in the ``/etc/cinder/cinder.conf`` file (see :ref:`block-storage-sample-configuration-file` for reference). -.. include:: ../../tables/cinder-eqlx.rst +.. include:: ../../tables/cinder-eqlx.inc Default (single-instance) configuration --------------------------------------- diff --git a/doc/source/configuration/block-storage/drivers/dell-storagecenter-driver.rst b/doc/source/configuration/block-storage/drivers/dell-storagecenter-driver.rst index 1d8861ef3a2..59e6083cc32 100644 --- a/doc/source/configuration/block-storage/drivers/dell-storagecenter-driver.rst +++ b/doc/source/configuration/block-storage/drivers/dell-storagecenter-driver.rst @@ -358,4 +358,4 @@ Driver options The following table contains the configuration options specific to the Dell Storage Center volume driver. -.. include:: ../../tables/cinder-dellsc.rst +.. include:: ../../tables/cinder-dellsc.inc diff --git a/doc/source/configuration/block-storage/drivers/dothill-driver.rst b/doc/source/configuration/block-storage/drivers/dothill-driver.rst index bb5e4370968..293be8505d0 100644 --- a/doc/source/configuration/block-storage/drivers/dothill-driver.rst +++ b/doc/source/configuration/block-storage/drivers/dothill-driver.rst @@ -165,4 +165,4 @@ Driver-specific options The following table contains the configuration options that are specific to the Dot Hill drivers. -.. include:: ../../tables/cinder-dothill.rst +.. include:: ../../tables/cinder-dothill.inc diff --git a/doc/source/configuration/block-storage/drivers/emc-xtremio-driver.rst b/doc/source/configuration/block-storage/drivers/emc-xtremio-driver.rst index bb394f9d425..86f74705b7e 100644 --- a/doc/source/configuration/block-storage/drivers/emc-xtremio-driver.rst +++ b/doc/source/configuration/block-storage/drivers/emc-xtremio-driver.rst @@ -53,7 +53,7 @@ under a separate section in case of multiple back ends (for example [XTREMIO]). The configuration file is usually located under the following path ``/etc/cinder/cinder.conf``. -.. include:: ../../tables/cinder-emc_xtremio.rst +.. include:: ../../tables/cinder-emc_xtremio.inc For a configuration example, refer to the configuration :ref:`emc_extremio_configuration_example`. diff --git a/doc/source/configuration/block-storage/drivers/falconstor-fss-driver.rst b/doc/source/configuration/block-storage/drivers/falconstor-fss-driver.rst index 92aa9b524a7..8a324caa27c 100644 --- a/doc/source/configuration/block-storage/drivers/falconstor-fss-driver.rst +++ b/doc/source/configuration/block-storage/drivers/falconstor-fss-driver.rst @@ -114,4 +114,4 @@ Driver options The following table contains the configuration options specific to the FalconStor FSS storage volume driver. -.. include:: ../../tables/cinder-falconstor.rst +.. include:: ../../tables/cinder-falconstor.inc diff --git a/doc/source/configuration/block-storage/drivers/hitachi-storage-volume-driver.rst b/doc/source/configuration/block-storage/drivers/hitachi-storage-volume-driver.rst index 5116ec15f57..a650cd128b7 100644 --- a/doc/source/configuration/block-storage/drivers/hitachi-storage-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/hitachi-storage-volume-driver.rst @@ -155,7 +155,7 @@ Set up Hitachi storage volume driver This table shows configuration options for Hitachi storage volume driver. - .. include:: ../../tables/cinder-hitachi-hbsd.rst + .. include:: ../../tables/cinder-hitachi-hbsd.inc #. Restart the Block Storage service. diff --git a/doc/source/configuration/block-storage/drivers/hp-msa-driver.rst b/doc/source/configuration/block-storage/drivers/hp-msa-driver.rst index bb348d2f983..bcbfe548765 100644 --- a/doc/source/configuration/block-storage/drivers/hp-msa-driver.rst +++ b/doc/source/configuration/block-storage/drivers/hp-msa-driver.rst @@ -162,4 +162,4 @@ Driver-specific options The following table contains the configuration options that are specific to the HP MSA drivers. -.. include:: ../../tables/cinder-hpmsa.rst +.. include:: ../../tables/cinder-hpmsa.inc diff --git a/doc/source/configuration/block-storage/drivers/hpe-3par-driver.rst b/doc/source/configuration/block-storage/drivers/hpe-3par-driver.rst index 5fb875f3711..319fa8917c6 100644 --- a/doc/source/configuration/block-storage/drivers/hpe-3par-driver.rst +++ b/doc/source/configuration/block-storage/drivers/hpe-3par-driver.rst @@ -381,4 +381,4 @@ service log files for errors. The following table contains all the configuration options supported by the HPE 3PAR Fibre Channel and iSCSI drivers. -.. include:: ../../tables/cinder-hpe3par.rst +.. include:: ../../tables/cinder-hpe3par.inc diff --git a/doc/source/configuration/block-storage/drivers/ibm-gpfs-volume-driver.rst b/doc/source/configuration/block-storage/drivers/ibm-gpfs-volume-driver.rst index a1708616a6d..da43b415db2 100644 --- a/doc/source/configuration/block-storage/drivers/ibm-gpfs-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/ibm-gpfs-volume-driver.rst @@ -74,7 +74,7 @@ in the ``cinder.conf`` as: The following table contains the configuration options supported by the Spectrum Scale driver in this deployment mode. -.. include:: ../../tables/cinder-ibm_gpfs.rst +.. include:: ../../tables/cinder-ibm_gpfs.inc .. note:: @@ -114,7 +114,7 @@ in the ``cinder.conf`` as: The following table contains the configuration options supported by the Spectrum Scale driver in this deployment mode. -.. include:: ../../tables/cinder-ibm_gpfs_remote.rst +.. include:: ../../tables/cinder-ibm_gpfs_remote.inc .. note:: @@ -149,7 +149,7 @@ in the ``cinder.conf`` as: The following table contains the configuration options supported by the Spectrum Scale driver in this deployment mode. -.. include:: ../../tables/cinder-ibm_gpfs_nfs.rst +.. include:: ../../tables/cinder-ibm_gpfs_nfs.inc Additionally, all the options of the base NFS driver are applicable for GPFSNFSDriver. The above table lists the basic configuration diff --git a/doc/source/configuration/block-storage/drivers/ibm-storage-volume-driver.rst b/doc/source/configuration/block-storage/drivers/ibm-storage-volume-driver.rst index fe188e84319..634dd3dbc23 100644 --- a/doc/source/configuration/block-storage/drivers/ibm-storage-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/ibm-storage-volume-driver.rst @@ -51,7 +51,7 @@ follows: volume_driver = cinder.volume.drivers.ibm.ibm_storage.IBMStorageDriver -.. include:: ../../tables/cinder-ibm_storage.rst +.. include:: ../../tables/cinder-ibm_storage.inc diff --git a/doc/source/configuration/block-storage/drivers/ibm-storwize-svc-driver.rst b/doc/source/configuration/block-storage/drivers/ibm-storwize-svc-driver.rst index 8c65c67c6a2..ec4abee70a7 100644 --- a/doc/source/configuration/block-storage/drivers/ibm-storwize-svc-driver.rst +++ b/doc/source/configuration/block-storage/drivers/ibm-storwize-svc-driver.rst @@ -230,7 +230,7 @@ Storwize family and SVC driver options in cinder.conf The following options specify default values for all volumes. Some can be over-ridden using volume types, which are described below. -.. include:: ../../tables/cinder-storwize.rst +.. include:: ../../tables/cinder-storwize.inc Note the following: diff --git a/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst b/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst index 6051b920b28..bc39ffc2f19 100644 --- a/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst @@ -179,4 +179,4 @@ Driver-specific options The following table contains the configuration options that are specific to the INFINIDAT driver. -.. include:: ../../tables/cinder-infinidat.rst +.. include:: ../../tables/cinder-infinidat.inc diff --git a/doc/source/configuration/block-storage/drivers/infortrend-volume-driver.rst b/doc/source/configuration/block-storage/drivers/infortrend-volume-driver.rst index 5a5a66b3bf6..6887fe33e76 100644 --- a/doc/source/configuration/block-storage/drivers/infortrend-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/infortrend-volume-driver.rst @@ -52,7 +52,7 @@ On ``cinder-volume`` nodes, set the following in your Driver options -------------- -.. include:: ../../tables/cinder-infortrend.rst +.. include:: ../../tables/cinder-infortrend.inc iSCSI configuration example --------------------------- diff --git a/doc/source/configuration/block-storage/drivers/itri-disco-driver.rst b/doc/source/configuration/block-storage/drivers/itri-disco-driver.rst index f3fe66b533c..b94e5280f6b 100644 --- a/doc/source/configuration/block-storage/drivers/itri-disco-driver.rst +++ b/doc/source/configuration/block-storage/drivers/itri-disco-driver.rst @@ -21,4 +21,4 @@ The DISCO driver supports the following features: Configuration options ~~~~~~~~~~~~~~~~~~~~~ -.. include:: ../../tables/cinder-disco.rst +.. include:: ../../tables/cinder-disco.inc diff --git a/doc/source/configuration/block-storage/drivers/kaminario-driver.rst b/doc/source/configuration/block-storage/drivers/kaminario-driver.rst index 160436db186..d8b5b091606 100644 --- a/doc/source/configuration/block-storage/drivers/kaminario-driver.rst +++ b/doc/source/configuration/block-storage/drivers/kaminario-driver.rst @@ -270,4 +270,4 @@ Driver options The following table contains the configuration options that are specific to the Kaminario K2 FC and iSCSI Block Storage drivers. -.. include:: ../../tables/cinder-kaminario.rst +.. include:: ../../tables/cinder-kaminario.inc diff --git a/doc/source/configuration/block-storage/drivers/lenovo-driver.rst b/doc/source/configuration/block-storage/drivers/lenovo-driver.rst index 8bfe3fbf98f..49c46142a60 100644 --- a/doc/source/configuration/block-storage/drivers/lenovo-driver.rst +++ b/doc/source/configuration/block-storage/drivers/lenovo-driver.rst @@ -156,4 +156,4 @@ Driver-specific options The following table contains the configuration options that are specific to the Lenovo drivers. -.. include:: ../../tables/cinder-lenovo.rst +.. include:: ../../tables/cinder-lenovo.inc diff --git a/doc/source/configuration/block-storage/drivers/lvm-volume-driver.rst b/doc/source/configuration/block-storage/drivers/lvm-volume-driver.rst index 31a655f963e..50b8285ba5e 100644 --- a/doc/source/configuration/block-storage/drivers/lvm-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/lvm-volume-driver.rst @@ -22,7 +22,7 @@ Use the following options to configure for the iSER transport: volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver iscsi_protocol = iser -.. include:: ../../tables/cinder-lvm.rst +.. include:: ../../tables/cinder-lvm.inc .. caution:: diff --git a/doc/source/configuration/block-storage/drivers/nec-storage-m-series-driver.rst b/doc/source/configuration/block-storage/drivers/nec-storage-m-series-driver.rst index d38eb2cadb3..accd2a357bd 100644 --- a/doc/source/configuration/block-storage/drivers/nec-storage-m-series-driver.rst +++ b/doc/source/configuration/block-storage/drivers/nec-storage-m-series-driver.rst @@ -112,7 +112,7 @@ Also, set ``volume_backend_name``. This table shows configuration options for NEC Storage M series driver. -.. include:: ../../tables/cinder-nec_m.rst +.. include:: ../../tables/cinder-nec_m.inc diff --git a/doc/source/configuration/block-storage/drivers/netapp-volume-driver.rst b/doc/source/configuration/block-storage/drivers/netapp-volume-driver.rst index 8c9313783dd..5a24984e9f0 100644 --- a/doc/source/configuration/block-storage/drivers/netapp-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/netapp-volume-driver.rst @@ -96,7 +96,7 @@ setting the ``volume_driver``, ``netapp_storage_family`` and To use the iSCSI protocol, you must override the default value of ``netapp_storage_protocol`` with ``iscsi``. -.. include:: ../../tables/cinder-netapp_cdot_iscsi.rst +.. include:: ../../tables/cinder-netapp_cdot_iscsi.inc .. note:: @@ -151,7 +151,7 @@ options in the ``cinder.conf`` file as follows: netapp_password = password nfs_shares_config = /etc/cinder/nfs_shares -.. include:: ../../tables/cinder-netapp_cdot_nfs.rst +.. include:: ../../tables/cinder-netapp_cdot_nfs.inc .. note:: @@ -263,7 +263,7 @@ extra specs. Use the specs in the following table to configure volumes. Define Block Storage volume types by using the :command:`openstack volume type set` command. -.. include:: ../../tables/manual/cinder-netapp_cdot_extraspecs.rst +.. include:: ../../tables/manual/cinder-netapp_cdot_extraspecs.inc NetApp Data ONTAP operating in 7-Mode storage family @@ -310,7 +310,7 @@ setting the ``volume_driver``, ``netapp_storage_family`` and To use the iSCSI protocol, you must override the default value of ``netapp_storage_protocol`` with ``iscsi``. -.. include:: ../../tables/cinder-netapp_7mode_iscsi.rst +.. include:: ../../tables/cinder-netapp_7mode_iscsi.inc .. note:: @@ -362,7 +362,7 @@ the ``volume_driver``, ``netapp_storage_family`` and netapp_password = password nfs_shares_config = /etc/cinder/nfs_shares -.. include:: ../../tables/cinder-netapp_7mode_nfs.rst +.. include:: ../../tables/cinder-netapp_7mode_nfs.inc .. note:: @@ -439,7 +439,7 @@ NetApp unified driver, E-Series, and iSCSI respectively by setting the To use the iSCSI protocol, you must override the default value of ``netapp_storage_protocol`` with ``iscsi``. -.. include:: ../../tables/cinder-netapp_eseries_iscsi.rst +.. include:: ../../tables/cinder-netapp_eseries_iscsi.inc .. tip:: diff --git a/doc/source/configuration/block-storage/drivers/nexentaedge-driver.rst b/doc/source/configuration/block-storage/drivers/nexentaedge-driver.rst index 8bd72217d09..b55dc41e552 100644 --- a/doc/source/configuration/block-storage/drivers/nexentaedge-driver.rst +++ b/doc/source/configuration/block-storage/drivers/nexentaedge-driver.rst @@ -156,4 +156,4 @@ Driver options Nexenta Driver supports these options: -.. include:: ../../tables/cinder-nexenta_edge.rst +.. include:: ../../tables/cinder-nexenta_edge.inc diff --git a/doc/source/configuration/block-storage/drivers/nexentastor4-driver.rst b/doc/source/configuration/block-storage/drivers/nexentastor4-driver.rst index ccd7cf5e234..d7e5b273613 100644 --- a/doc/source/configuration/block-storage/drivers/nexentastor4-driver.rst +++ b/doc/source/configuration/block-storage/drivers/nexentastor4-driver.rst @@ -138,4 +138,4 @@ Driver options Nexenta Driver supports these options: -.. include:: ../../tables/cinder-nexenta.rst +.. include:: ../../tables/cinder-nexenta.inc diff --git a/doc/source/configuration/block-storage/drivers/nexentastor5-driver.rst b/doc/source/configuration/block-storage/drivers/nexentastor5-driver.rst index 30802aab86c..2e46d368a44 100644 --- a/doc/source/configuration/block-storage/drivers/nexentastor5-driver.rst +++ b/doc/source/configuration/block-storage/drivers/nexentastor5-driver.rst @@ -150,4 +150,4 @@ Driver options Nexenta Driver supports these options: -.. include:: ../../tables/cinder-nexenta5.rst +.. include:: ../../tables/cinder-nexenta5.inc diff --git a/doc/source/configuration/block-storage/drivers/nfs-volume-driver.rst b/doc/source/configuration/block-storage/drivers/nfs-volume-driver.rst index 4d99eb842ef..fe2474dab25 100644 --- a/doc/source/configuration/block-storage/drivers/nfs-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/nfs-volume-driver.rst @@ -33,7 +33,7 @@ in the ``cinder.conf`` configuration file: The following table contains the options supported by the NFS driver. -.. include:: ../../tables/cinder-storage_nfs.rst +.. include:: ../../tables/cinder-storage_nfs.inc .. note:: diff --git a/doc/source/configuration/block-storage/drivers/nimble-volume-driver.rst b/doc/source/configuration/block-storage/drivers/nimble-volume-driver.rst index 1c5763b2084..1347178483f 100644 --- a/doc/source/configuration/block-storage/drivers/nimble-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/nimble-volume-driver.rst @@ -131,4 +131,4 @@ Configuration options The Nimble storage driver supports these configuration options: -.. include:: ../../tables/cinder-nimble.rst +.. include:: ../../tables/cinder-nimble.inc diff --git a/doc/source/configuration/block-storage/drivers/prophetstor-dpl-driver.rst b/doc/source/configuration/block-storage/drivers/prophetstor-dpl-driver.rst index 3f6d21261ac..9d5a2bc8d9a 100644 --- a/doc/source/configuration/block-storage/drivers/prophetstor-dpl-driver.rst +++ b/doc/source/configuration/block-storage/drivers/prophetstor-dpl-driver.rst @@ -101,4 +101,4 @@ service log files for errors. The following table contains the options supported by the ProphetStor storage driver. -.. include:: ../../tables/cinder-prophetstor_dpl.rst +.. include:: ../../tables/cinder-prophetstor_dpl.inc diff --git a/doc/source/configuration/block-storage/drivers/quobyte-driver.rst b/doc/source/configuration/block-storage/drivers/quobyte-driver.rst index f0280a8b1f2..c91e1dcbd1b 100644 --- a/doc/source/configuration/block-storage/drivers/quobyte-driver.rst +++ b/doc/source/configuration/block-storage/drivers/quobyte-driver.rst @@ -58,4 +58,4 @@ To activate the Quobyte volume driver, configure the corresponding The following table contains the configuration options supported by the Quobyte driver: -.. include:: ../../tables/cinder-quobyte.rst +.. include:: ../../tables/cinder-quobyte.inc diff --git a/doc/source/configuration/block-storage/drivers/scality-sofs-driver.rst b/doc/source/configuration/block-storage/drivers/scality-sofs-driver.rst index 2acb1be6efa..9097de8b333 100644 --- a/doc/source/configuration/block-storage/drivers/scality-sofs-driver.rst +++ b/doc/source/configuration/block-storage/drivers/scality-sofs-driver.rst @@ -65,4 +65,4 @@ file: scality_sofs_mount_point = /cinder scality_sofs_config = /etc/sfused.conf -.. include:: ../../tables/cinder-scality.rst +.. include:: ../../tables/cinder-scality.inc diff --git a/doc/source/configuration/block-storage/drivers/sheepdog-driver.rst b/doc/source/configuration/block-storage/drivers/sheepdog-driver.rst index 775b090f2cf..20c936e855c 100644 --- a/doc/source/configuration/block-storage/drivers/sheepdog-driver.rst +++ b/doc/source/configuration/block-storage/drivers/sheepdog-driver.rst @@ -45,4 +45,4 @@ Set the following option in the ``cinder.conf`` file: The following table contains the configuration options supported by the Sheepdog driver: -.. include:: ../../tables/cinder-sheepdog.rst +.. include:: ../../tables/cinder-sheepdog.inc diff --git a/doc/source/configuration/block-storage/drivers/smbfs-volume-driver.rst b/doc/source/configuration/block-storage/drivers/smbfs-volume-driver.rst index e0f12974218..787880a5768 100644 --- a/doc/source/configuration/block-storage/drivers/smbfs-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/smbfs-volume-driver.rst @@ -14,4 +14,4 @@ your ``cinder.conf`` file, and use the following options to configure it. volume_driver = cinder.volume.drivers.smbfs.SmbfsDriver -.. include:: ../../tables/cinder-smbfs.rst +.. include:: ../../tables/cinder-smbfs.inc diff --git a/doc/source/configuration/block-storage/drivers/solidfire-volume-driver.rst b/doc/source/configuration/block-storage/drivers/solidfire-volume-driver.rst index 7ddaa870ded..6bf93ea3bae 100644 --- a/doc/source/configuration/block-storage/drivers/solidfire-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/solidfire-volume-driver.rst @@ -48,7 +48,7 @@ To configure the use of a SolidFire cluster with Block Storage, modify your deployment it is recommended to add the Cluster as if it were a second backend and disable new deployments to the current back end. -.. include:: ../../tables/cinder-solidfire.rst +.. include:: ../../tables/cinder-solidfire.inc Supported operations ~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/configuration/block-storage/drivers/synology-dsm-driver.rst b/doc/source/configuration/block-storage/drivers/synology-dsm-driver.rst index 72e1c6a0d5c..aaa5ed2667a 100755 --- a/doc/source/configuration/block-storage/drivers/synology-dsm-driver.rst +++ b/doc/source/configuration/block-storage/drivers/synology-dsm-driver.rst @@ -121,4 +121,4 @@ Configuration options The Synology DSM driver supports the following configuration options: -.. include:: ../../tables/cinder-synology.rst +.. include:: ../../tables/cinder-synology.inc diff --git a/doc/source/configuration/block-storage/drivers/tintri-volume-driver.rst b/doc/source/configuration/block-storage/drivers/tintri-volume-driver.rst index 453a82abfb3..b738bd26bf4 100644 --- a/doc/source/configuration/block-storage/drivers/tintri-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/tintri-volume-driver.rst @@ -78,4 +78,4 @@ following actions: {vmstore_data_ip}:/tintri/{submount2} -.. include:: ../../tables/cinder-tintri.rst +.. include:: ../../tables/cinder-tintri.inc diff --git a/doc/source/configuration/block-storage/drivers/vmware-vmdk-driver.rst b/doc/source/configuration/block-storage/drivers/vmware-vmdk-driver.rst index dd75772a79d..9cbe5535464 100644 --- a/doc/source/configuration/block-storage/drivers/vmware-vmdk-driver.rst +++ b/doc/source/configuration/block-storage/drivers/vmware-vmdk-driver.rst @@ -56,7 +56,7 @@ driver: The following table lists various options that the drivers support for the OpenStack Block Storage configuration (``cinder.conf``): -.. include:: ../../tables/cinder-vmware.rst +.. include:: ../../tables/cinder-vmware.inc VMDK disk type ~~~~~~~~~~~~~~ diff --git a/doc/source/configuration/block-storage/drivers/vzstorage-driver.rst b/doc/source/configuration/block-storage/drivers/vzstorage-driver.rst index 79411666ca7..a8da98f3d73 100644 --- a/doc/source/configuration/block-storage/drivers/vzstorage-driver.rst +++ b/doc/source/configuration/block-storage/drivers/vzstorage-driver.rst @@ -11,4 +11,4 @@ options to configure it. volume_driver = cinder.volume.drivers.vzstorage.VZStorageDriver -.. include:: ../../tables/cinder-vzstorage.rst +.. include:: ../../tables/cinder-vzstorage.inc diff --git a/doc/source/configuration/block-storage/drivers/windows-iscsi-volume-driver.rst b/doc/source/configuration/block-storage/drivers/windows-iscsi-volume-driver.rst index 709bdd3990f..3cd56a03464 100644 --- a/doc/source/configuration/block-storage/drivers/windows-iscsi-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/windows-iscsi-volume-driver.rst @@ -107,7 +107,7 @@ configuration sample for using the Windows iSCSI Driver: The following table contains a reference to the only driver specific option that will be used by the Block Storage Windows driver: -.. include:: ../../tables/cinder-windows.rst +.. include:: ../../tables/cinder-windows.inc Run cinder-volume ----------------- diff --git a/doc/source/configuration/block-storage/drivers/xio-volume-driver.rst b/doc/source/configuration/block-storage/drivers/xio-volume-driver.rst index 32ebb7e0014..f44ebf5cfc0 100644 --- a/doc/source/configuration/block-storage/drivers/xio-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/xio-volume-driver.rst @@ -57,7 +57,7 @@ iSCSI Optional configuration parameters --------------------------------- -.. include:: ../../tables/cinder-xio.rst +.. include:: ../../tables/cinder-xio.inc Multipath --------- diff --git a/doc/source/configuration/block-storage/drivers/zadara-volume-driver.rst b/doc/source/configuration/block-storage/drivers/zadara-volume-driver.rst index 8c134c034c5..d2cca097896 100644 --- a/doc/source/configuration/block-storage/drivers/zadara-volume-driver.rst +++ b/doc/source/configuration/block-storage/drivers/zadara-volume-driver.rst @@ -73,7 +73,7 @@ Driver-specific options This section contains the configuration options that are specific to the Zadara Storage VPSA driver. -.. include:: ../../tables/cinder-zadara.rst +.. include:: ../../tables/cinder-zadara.inc .. note:: diff --git a/doc/source/configuration/block-storage/drivers/zfssa-iscsi-driver.rst b/doc/source/configuration/block-storage/drivers/zfssa-iscsi-driver.rst index 71877521b8d..2c8c20bfa97 100644 --- a/doc/source/configuration/block-storage/drivers/zfssa-iscsi-driver.rst +++ b/doc/source/configuration/block-storage/drivers/zfssa-iscsi-driver.rst @@ -262,4 +262,4 @@ Driver options The Oracle ZFSSA iSCSI Driver supports these options: -.. include:: ../../tables/cinder-zfssa-iscsi.rst +.. include:: ../../tables/cinder-zfssa-iscsi.inc diff --git a/doc/source/configuration/block-storage/drivers/zfssa-nfs-driver.rst b/doc/source/configuration/block-storage/drivers/zfssa-nfs-driver.rst index 90d9264288f..9aa809b890a 100644 --- a/doc/source/configuration/block-storage/drivers/zfssa-nfs-driver.rst +++ b/doc/source/configuration/block-storage/drivers/zfssa-nfs-driver.rst @@ -291,7 +291,7 @@ Driver options The Oracle ZFS Storage Appliance NFS driver supports these options: -.. include:: ../../tables/cinder-zfssa-nfs.rst +.. include:: ../../tables/cinder-zfssa-nfs.inc This driver shares additional NFS configuration options with the generic NFS driver. For a description of these, see :ref:`cinder-storage_nfs`. diff --git a/doc/source/configuration/block-storage/drivers/zte-storage-driver.rst b/doc/source/configuration/block-storage/drivers/zte-storage-driver.rst index 898122a5f97..4044e8f44b0 100644 --- a/doc/source/configuration/block-storage/drivers/zte-storage-driver.rst +++ b/doc/source/configuration/block-storage/drivers/zte-storage-driver.rst @@ -155,4 +155,4 @@ Driver-specific options The following table contains the configuration options that are specific to the ZTE drivers. -.. include:: ../../tables/cinder-zte.rst +.. include:: ../../tables/cinder-zte.inc diff --git a/doc/source/configuration/block-storage/fc-zoning.rst b/doc/source/configuration/block-storage/fc-zoning.rst index 28085e3675f..b88310a896a 100644 --- a/doc/source/configuration/block-storage/fc-zoning.rst +++ b/doc/source/configuration/block-storage/fc-zoning.rst @@ -19,7 +19,7 @@ configuration options to enable Fibre Channel Zone Manager. Make the following changes in the ``/etc/cinder/cinder.conf`` file. -.. include:: ../tables/cinder-zoning.rst +.. include:: ../tables/cinder-zoning.inc To use different Fibre Channel Zone Drivers, use the parameters described in this section. @@ -48,12 +48,12 @@ through HTTP, HTTPS, or SSH. Set the following options in the ``cinder.conf`` configuration file. -.. include:: ../tables/cinder-zoning_manager_brcd.rst +.. include:: ../tables/cinder-zoning_manager_brcd.inc Configure SAN fabric parameters in the form of fabric groups as described in the example below: -.. include:: ../tables/cinder-zoning_fabric_brcd.rst +.. include:: ../tables/cinder-zoning_fabric_brcd.inc .. note:: @@ -99,12 +99,12 @@ Set the following options in the ``cinder.conf`` configuration file. fc_fabric_names = CISCO_FABRIC_EXAMPLE cisco_sb_connector = cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli.CiscoFCZoneClientCLI -.. include:: ../tables/cinder-zoning_manager_cisco.rst +.. include:: ../tables/cinder-zoning_manager_cisco.inc Configure SAN fabric parameters in the form of fabric groups as described in the example below: -.. include:: ../tables/cinder-zoning_fabric_cisco.rst +.. include:: ../tables/cinder-zoning_fabric_cisco.inc .. note:: diff --git a/doc/source/configuration/tables/cinder-api.rst b/doc/source/configuration/tables/cinder-api.inc similarity index 100% rename from doc/source/configuration/tables/cinder-api.rst rename to doc/source/configuration/tables/cinder-api.inc diff --git a/doc/source/configuration/tables/cinder-auth.rst b/doc/source/configuration/tables/cinder-auth.inc similarity index 100% rename from doc/source/configuration/tables/cinder-auth.rst rename to doc/source/configuration/tables/cinder-auth.inc diff --git a/doc/source/configuration/tables/cinder-backups.rst b/doc/source/configuration/tables/cinder-backups.inc similarity index 100% rename from doc/source/configuration/tables/cinder-backups.rst rename to doc/source/configuration/tables/cinder-backups.inc diff --git a/doc/source/configuration/tables/cinder-backups_ceph.rst b/doc/source/configuration/tables/cinder-backups_ceph.inc similarity index 100% rename from doc/source/configuration/tables/cinder-backups_ceph.rst rename to doc/source/configuration/tables/cinder-backups_ceph.inc diff --git a/doc/source/configuration/tables/cinder-backups_gcs.rst b/doc/source/configuration/tables/cinder-backups_gcs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-backups_gcs.rst rename to doc/source/configuration/tables/cinder-backups_gcs.inc diff --git a/doc/source/configuration/tables/cinder-backups_glusterfs.rst b/doc/source/configuration/tables/cinder-backups_glusterfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-backups_glusterfs.rst rename to doc/source/configuration/tables/cinder-backups_glusterfs.inc diff --git a/doc/source/configuration/tables/cinder-backups_nfs.rst b/doc/source/configuration/tables/cinder-backups_nfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-backups_nfs.rst rename to doc/source/configuration/tables/cinder-backups_nfs.inc diff --git a/doc/source/configuration/tables/cinder-backups_posix.rst b/doc/source/configuration/tables/cinder-backups_posix.inc similarity index 100% rename from doc/source/configuration/tables/cinder-backups_posix.rst rename to doc/source/configuration/tables/cinder-backups_posix.inc diff --git a/doc/source/configuration/tables/cinder-backups_swift.rst b/doc/source/configuration/tables/cinder-backups_swift.inc similarity index 100% rename from doc/source/configuration/tables/cinder-backups_swift.rst rename to doc/source/configuration/tables/cinder-backups_swift.inc diff --git a/doc/source/configuration/tables/cinder-backups_tsm.rst b/doc/source/configuration/tables/cinder-backups_tsm.inc similarity index 100% rename from doc/source/configuration/tables/cinder-backups_tsm.rst rename to doc/source/configuration/tables/cinder-backups_tsm.inc diff --git a/doc/source/configuration/tables/cinder-block-device.rst b/doc/source/configuration/tables/cinder-block-device.inc similarity index 100% rename from doc/source/configuration/tables/cinder-block-device.rst rename to doc/source/configuration/tables/cinder-block-device.inc diff --git a/doc/source/configuration/tables/cinder-blockbridge.rst b/doc/source/configuration/tables/cinder-blockbridge.inc similarity index 100% rename from doc/source/configuration/tables/cinder-blockbridge.rst rename to doc/source/configuration/tables/cinder-blockbridge.inc diff --git a/doc/source/configuration/tables/cinder-cloudbyte.rst b/doc/source/configuration/tables/cinder-cloudbyte.inc similarity index 100% rename from doc/source/configuration/tables/cinder-cloudbyte.rst rename to doc/source/configuration/tables/cinder-cloudbyte.inc diff --git a/doc/source/configuration/tables/cinder-coho.rst b/doc/source/configuration/tables/cinder-coho.inc similarity index 100% rename from doc/source/configuration/tables/cinder-coho.rst rename to doc/source/configuration/tables/cinder-coho.inc diff --git a/doc/source/configuration/tables/cinder-common.rst b/doc/source/configuration/tables/cinder-common.inc similarity index 100% rename from doc/source/configuration/tables/cinder-common.rst rename to doc/source/configuration/tables/cinder-common.inc diff --git a/doc/source/configuration/tables/cinder-compute.rst b/doc/source/configuration/tables/cinder-compute.inc similarity index 100% rename from doc/source/configuration/tables/cinder-compute.rst rename to doc/source/configuration/tables/cinder-compute.inc diff --git a/doc/source/configuration/tables/cinder-coordination.rst b/doc/source/configuration/tables/cinder-coordination.inc similarity index 100% rename from doc/source/configuration/tables/cinder-coordination.rst rename to doc/source/configuration/tables/cinder-coordination.inc diff --git a/doc/source/configuration/tables/cinder-coprhd.rst b/doc/source/configuration/tables/cinder-coprhd.inc similarity index 100% rename from doc/source/configuration/tables/cinder-coprhd.rst rename to doc/source/configuration/tables/cinder-coprhd.inc diff --git a/doc/source/configuration/tables/cinder-datera.rst b/doc/source/configuration/tables/cinder-datera.inc similarity index 100% rename from doc/source/configuration/tables/cinder-datera.rst rename to doc/source/configuration/tables/cinder-datera.inc diff --git a/doc/source/configuration/tables/cinder-debug.rst b/doc/source/configuration/tables/cinder-debug.inc similarity index 100% rename from doc/source/configuration/tables/cinder-debug.rst rename to doc/source/configuration/tables/cinder-debug.inc diff --git a/doc/source/configuration/tables/cinder-dell_emc_unity.rst b/doc/source/configuration/tables/cinder-dell_emc_unity.inc similarity index 100% rename from doc/source/configuration/tables/cinder-dell_emc_unity.rst rename to doc/source/configuration/tables/cinder-dell_emc_unity.inc diff --git a/doc/source/configuration/tables/cinder-dellsc.rst b/doc/source/configuration/tables/cinder-dellsc.inc similarity index 100% rename from doc/source/configuration/tables/cinder-dellsc.rst rename to doc/source/configuration/tables/cinder-dellsc.inc diff --git a/doc/source/configuration/tables/cinder-disco.rst b/doc/source/configuration/tables/cinder-disco.inc similarity index 100% rename from doc/source/configuration/tables/cinder-disco.rst rename to doc/source/configuration/tables/cinder-disco.inc diff --git a/doc/source/configuration/tables/cinder-dothill.rst b/doc/source/configuration/tables/cinder-dothill.inc similarity index 100% rename from doc/source/configuration/tables/cinder-dothill.rst rename to doc/source/configuration/tables/cinder-dothill.inc diff --git a/doc/source/configuration/tables/cinder-drbd.rst b/doc/source/configuration/tables/cinder-drbd.inc similarity index 100% rename from doc/source/configuration/tables/cinder-drbd.rst rename to doc/source/configuration/tables/cinder-drbd.inc diff --git a/doc/source/configuration/tables/cinder-emc.rst b/doc/source/configuration/tables/cinder-emc.inc similarity index 100% rename from doc/source/configuration/tables/cinder-emc.rst rename to doc/source/configuration/tables/cinder-emc.inc diff --git a/doc/source/configuration/tables/cinder-emc_sio.rst b/doc/source/configuration/tables/cinder-emc_sio.inc similarity index 100% rename from doc/source/configuration/tables/cinder-emc_sio.rst rename to doc/source/configuration/tables/cinder-emc_sio.inc diff --git a/doc/source/configuration/tables/cinder-emc_xtremio.rst b/doc/source/configuration/tables/cinder-emc_xtremio.inc similarity index 100% rename from doc/source/configuration/tables/cinder-emc_xtremio.rst rename to doc/source/configuration/tables/cinder-emc_xtremio.inc diff --git a/doc/source/configuration/tables/cinder-eqlx.rst b/doc/source/configuration/tables/cinder-eqlx.inc similarity index 100% rename from doc/source/configuration/tables/cinder-eqlx.rst rename to doc/source/configuration/tables/cinder-eqlx.inc diff --git a/doc/source/configuration/tables/cinder-eternus.rst b/doc/source/configuration/tables/cinder-eternus.inc similarity index 100% rename from doc/source/configuration/tables/cinder-eternus.rst rename to doc/source/configuration/tables/cinder-eternus.inc diff --git a/doc/source/configuration/tables/cinder-falconstor.rst b/doc/source/configuration/tables/cinder-falconstor.inc similarity index 100% rename from doc/source/configuration/tables/cinder-falconstor.rst rename to doc/source/configuration/tables/cinder-falconstor.inc diff --git a/doc/source/configuration/tables/cinder-flashsystem.rst b/doc/source/configuration/tables/cinder-flashsystem.inc similarity index 100% rename from doc/source/configuration/tables/cinder-flashsystem.rst rename to doc/source/configuration/tables/cinder-flashsystem.inc diff --git a/doc/source/configuration/tables/cinder-fusionio.rst b/doc/source/configuration/tables/cinder-fusionio.inc similarity index 100% rename from doc/source/configuration/tables/cinder-fusionio.rst rename to doc/source/configuration/tables/cinder-fusionio.inc diff --git a/doc/source/configuration/tables/cinder-hgst.rst b/doc/source/configuration/tables/cinder-hgst.inc similarity index 100% rename from doc/source/configuration/tables/cinder-hgst.rst rename to doc/source/configuration/tables/cinder-hgst.inc diff --git a/doc/source/configuration/tables/cinder-hitachi-hbsd.rst b/doc/source/configuration/tables/cinder-hitachi-hbsd.inc similarity index 100% rename from doc/source/configuration/tables/cinder-hitachi-hbsd.rst rename to doc/source/configuration/tables/cinder-hitachi-hbsd.inc diff --git a/doc/source/configuration/tables/cinder-hitachi-hnas.rst b/doc/source/configuration/tables/cinder-hitachi-hnas.inc similarity index 100% rename from doc/source/configuration/tables/cinder-hitachi-hnas.rst rename to doc/source/configuration/tables/cinder-hitachi-hnas.inc diff --git a/doc/source/configuration/tables/cinder-hitachi-vsp.rst b/doc/source/configuration/tables/cinder-hitachi-vsp.inc similarity index 100% rename from doc/source/configuration/tables/cinder-hitachi-vsp.rst rename to doc/source/configuration/tables/cinder-hitachi-vsp.inc diff --git a/doc/source/configuration/tables/cinder-hpe3par.rst b/doc/source/configuration/tables/cinder-hpe3par.inc similarity index 100% rename from doc/source/configuration/tables/cinder-hpe3par.rst rename to doc/source/configuration/tables/cinder-hpe3par.inc diff --git a/doc/source/configuration/tables/cinder-hpelefthand.rst b/doc/source/configuration/tables/cinder-hpelefthand.inc similarity index 100% rename from doc/source/configuration/tables/cinder-hpelefthand.rst rename to doc/source/configuration/tables/cinder-hpelefthand.inc diff --git a/doc/source/configuration/tables/cinder-hpexp.rst b/doc/source/configuration/tables/cinder-hpexp.inc similarity index 100% rename from doc/source/configuration/tables/cinder-hpexp.rst rename to doc/source/configuration/tables/cinder-hpexp.inc diff --git a/doc/source/configuration/tables/cinder-hpmsa.rst b/doc/source/configuration/tables/cinder-hpmsa.inc similarity index 100% rename from doc/source/configuration/tables/cinder-hpmsa.rst rename to doc/source/configuration/tables/cinder-hpmsa.inc diff --git a/doc/source/configuration/tables/cinder-huawei.rst b/doc/source/configuration/tables/cinder-huawei.inc similarity index 100% rename from doc/source/configuration/tables/cinder-huawei.rst rename to doc/source/configuration/tables/cinder-huawei.inc diff --git a/doc/source/configuration/tables/cinder-hyperv.rst b/doc/source/configuration/tables/cinder-hyperv.inc similarity index 100% rename from doc/source/configuration/tables/cinder-hyperv.rst rename to doc/source/configuration/tables/cinder-hyperv.inc diff --git a/doc/source/configuration/tables/cinder-ibm_gpfs.rst b/doc/source/configuration/tables/cinder-ibm_gpfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-ibm_gpfs.rst rename to doc/source/configuration/tables/cinder-ibm_gpfs.inc diff --git a/doc/source/configuration/tables/cinder-ibm_gpfs_nfs.rst b/doc/source/configuration/tables/cinder-ibm_gpfs_nfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-ibm_gpfs_nfs.rst rename to doc/source/configuration/tables/cinder-ibm_gpfs_nfs.inc diff --git a/doc/source/configuration/tables/cinder-ibm_gpfs_remote.rst b/doc/source/configuration/tables/cinder-ibm_gpfs_remote.inc similarity index 100% rename from doc/source/configuration/tables/cinder-ibm_gpfs_remote.rst rename to doc/source/configuration/tables/cinder-ibm_gpfs_remote.inc diff --git a/doc/source/configuration/tables/cinder-ibm_storage.rst b/doc/source/configuration/tables/cinder-ibm_storage.inc similarity index 100% rename from doc/source/configuration/tables/cinder-ibm_storage.rst rename to doc/source/configuration/tables/cinder-ibm_storage.inc diff --git a/doc/source/configuration/tables/cinder-images.rst b/doc/source/configuration/tables/cinder-images.inc similarity index 100% rename from doc/source/configuration/tables/cinder-images.rst rename to doc/source/configuration/tables/cinder-images.inc diff --git a/doc/source/configuration/tables/cinder-infinidat.rst b/doc/source/configuration/tables/cinder-infinidat.inc similarity index 100% rename from doc/source/configuration/tables/cinder-infinidat.rst rename to doc/source/configuration/tables/cinder-infinidat.inc diff --git a/doc/source/configuration/tables/cinder-infortrend.rst b/doc/source/configuration/tables/cinder-infortrend.inc similarity index 100% rename from doc/source/configuration/tables/cinder-infortrend.rst rename to doc/source/configuration/tables/cinder-infortrend.inc diff --git a/doc/source/configuration/tables/cinder-kaminario.rst b/doc/source/configuration/tables/cinder-kaminario.inc similarity index 100% rename from doc/source/configuration/tables/cinder-kaminario.rst rename to doc/source/configuration/tables/cinder-kaminario.inc diff --git a/doc/source/configuration/tables/cinder-lenovo.rst b/doc/source/configuration/tables/cinder-lenovo.inc similarity index 100% rename from doc/source/configuration/tables/cinder-lenovo.rst rename to doc/source/configuration/tables/cinder-lenovo.inc diff --git a/doc/source/configuration/tables/cinder-lvm.rst b/doc/source/configuration/tables/cinder-lvm.inc similarity index 100% rename from doc/source/configuration/tables/cinder-lvm.rst rename to doc/source/configuration/tables/cinder-lvm.inc diff --git a/doc/source/configuration/tables/cinder-nas.rst b/doc/source/configuration/tables/cinder-nas.inc similarity index 100% rename from doc/source/configuration/tables/cinder-nas.rst rename to doc/source/configuration/tables/cinder-nas.inc diff --git a/doc/source/configuration/tables/cinder-nec_m.rst b/doc/source/configuration/tables/cinder-nec_m.inc similarity index 100% rename from doc/source/configuration/tables/cinder-nec_m.rst rename to doc/source/configuration/tables/cinder-nec_m.inc diff --git a/doc/source/configuration/tables/cinder-netapp_7mode_iscsi.rst b/doc/source/configuration/tables/cinder-netapp_7mode_iscsi.inc similarity index 100% rename from doc/source/configuration/tables/cinder-netapp_7mode_iscsi.rst rename to doc/source/configuration/tables/cinder-netapp_7mode_iscsi.inc diff --git a/doc/source/configuration/tables/cinder-netapp_7mode_nfs.rst b/doc/source/configuration/tables/cinder-netapp_7mode_nfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-netapp_7mode_nfs.rst rename to doc/source/configuration/tables/cinder-netapp_7mode_nfs.inc diff --git a/doc/source/configuration/tables/cinder-netapp_cdot_iscsi.rst b/doc/source/configuration/tables/cinder-netapp_cdot_iscsi.inc similarity index 100% rename from doc/source/configuration/tables/cinder-netapp_cdot_iscsi.rst rename to doc/source/configuration/tables/cinder-netapp_cdot_iscsi.inc diff --git a/doc/source/configuration/tables/cinder-netapp_cdot_nfs.rst b/doc/source/configuration/tables/cinder-netapp_cdot_nfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-netapp_cdot_nfs.rst rename to doc/source/configuration/tables/cinder-netapp_cdot_nfs.inc diff --git a/doc/source/configuration/tables/cinder-netapp_eseries_iscsi.rst b/doc/source/configuration/tables/cinder-netapp_eseries_iscsi.inc similarity index 100% rename from doc/source/configuration/tables/cinder-netapp_eseries_iscsi.rst rename to doc/source/configuration/tables/cinder-netapp_eseries_iscsi.inc diff --git a/doc/source/configuration/tables/cinder-nexenta.rst b/doc/source/configuration/tables/cinder-nexenta.inc similarity index 100% rename from doc/source/configuration/tables/cinder-nexenta.rst rename to doc/source/configuration/tables/cinder-nexenta.inc diff --git a/doc/source/configuration/tables/cinder-nexenta5.rst b/doc/source/configuration/tables/cinder-nexenta5.inc similarity index 100% rename from doc/source/configuration/tables/cinder-nexenta5.rst rename to doc/source/configuration/tables/cinder-nexenta5.inc diff --git a/doc/source/configuration/tables/cinder-nexenta_edge.rst b/doc/source/configuration/tables/cinder-nexenta_edge.inc similarity index 100% rename from doc/source/configuration/tables/cinder-nexenta_edge.rst rename to doc/source/configuration/tables/cinder-nexenta_edge.inc diff --git a/doc/source/configuration/tables/cinder-nimble.rst b/doc/source/configuration/tables/cinder-nimble.inc similarity index 100% rename from doc/source/configuration/tables/cinder-nimble.rst rename to doc/source/configuration/tables/cinder-nimble.inc diff --git a/doc/source/configuration/tables/cinder-osbrick.rst b/doc/source/configuration/tables/cinder-osbrick.inc similarity index 100% rename from doc/source/configuration/tables/cinder-osbrick.rst rename to doc/source/configuration/tables/cinder-osbrick.inc diff --git a/doc/source/configuration/tables/cinder-profiler.rst b/doc/source/configuration/tables/cinder-profiler.inc similarity index 100% rename from doc/source/configuration/tables/cinder-profiler.rst rename to doc/source/configuration/tables/cinder-profiler.inc diff --git a/doc/source/configuration/tables/cinder-prophetstor_dpl.rst b/doc/source/configuration/tables/cinder-prophetstor_dpl.inc similarity index 100% rename from doc/source/configuration/tables/cinder-prophetstor_dpl.rst rename to doc/source/configuration/tables/cinder-prophetstor_dpl.inc diff --git a/doc/source/configuration/tables/cinder-pure.rst b/doc/source/configuration/tables/cinder-pure.inc similarity index 100% rename from doc/source/configuration/tables/cinder-pure.rst rename to doc/source/configuration/tables/cinder-pure.inc diff --git a/doc/source/configuration/tables/cinder-qnap.rst b/doc/source/configuration/tables/cinder-qnap.inc similarity index 100% rename from doc/source/configuration/tables/cinder-qnap.rst rename to doc/source/configuration/tables/cinder-qnap.inc diff --git a/doc/source/configuration/tables/cinder-quobyte.rst b/doc/source/configuration/tables/cinder-quobyte.inc similarity index 100% rename from doc/source/configuration/tables/cinder-quobyte.rst rename to doc/source/configuration/tables/cinder-quobyte.inc diff --git a/doc/source/configuration/tables/cinder-quota.rst b/doc/source/configuration/tables/cinder-quota.inc similarity index 100% rename from doc/source/configuration/tables/cinder-quota.rst rename to doc/source/configuration/tables/cinder-quota.inc diff --git a/doc/source/configuration/tables/cinder-redis.rst b/doc/source/configuration/tables/cinder-redis.inc similarity index 100% rename from doc/source/configuration/tables/cinder-redis.rst rename to doc/source/configuration/tables/cinder-redis.inc diff --git a/doc/source/configuration/tables/cinder-san.rst b/doc/source/configuration/tables/cinder-san.inc similarity index 100% rename from doc/source/configuration/tables/cinder-san.rst rename to doc/source/configuration/tables/cinder-san.inc diff --git a/doc/source/configuration/tables/cinder-scality.rst b/doc/source/configuration/tables/cinder-scality.inc similarity index 100% rename from doc/source/configuration/tables/cinder-scality.rst rename to doc/source/configuration/tables/cinder-scality.inc diff --git a/doc/source/configuration/tables/cinder-scheduler.rst b/doc/source/configuration/tables/cinder-scheduler.inc similarity index 100% rename from doc/source/configuration/tables/cinder-scheduler.rst rename to doc/source/configuration/tables/cinder-scheduler.inc diff --git a/doc/source/configuration/tables/cinder-scst.rst b/doc/source/configuration/tables/cinder-scst.inc similarity index 100% rename from doc/source/configuration/tables/cinder-scst.rst rename to doc/source/configuration/tables/cinder-scst.inc diff --git a/doc/source/configuration/tables/cinder-sheepdog.rst b/doc/source/configuration/tables/cinder-sheepdog.inc similarity index 100% rename from doc/source/configuration/tables/cinder-sheepdog.rst rename to doc/source/configuration/tables/cinder-sheepdog.inc diff --git a/doc/source/configuration/tables/cinder-smbfs.rst b/doc/source/configuration/tables/cinder-smbfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-smbfs.rst rename to doc/source/configuration/tables/cinder-smbfs.inc diff --git a/doc/source/configuration/tables/cinder-solidfire.rst b/doc/source/configuration/tables/cinder-solidfire.inc similarity index 100% rename from doc/source/configuration/tables/cinder-solidfire.rst rename to doc/source/configuration/tables/cinder-solidfire.inc diff --git a/doc/source/configuration/tables/cinder-storage.rst b/doc/source/configuration/tables/cinder-storage.inc similarity index 100% rename from doc/source/configuration/tables/cinder-storage.rst rename to doc/source/configuration/tables/cinder-storage.inc diff --git a/doc/source/configuration/tables/cinder-storage_ceph.rst b/doc/source/configuration/tables/cinder-storage_ceph.inc similarity index 100% rename from doc/source/configuration/tables/cinder-storage_ceph.rst rename to doc/source/configuration/tables/cinder-storage_ceph.inc diff --git a/doc/source/configuration/tables/cinder-storage_gpfs.rst b/doc/source/configuration/tables/cinder-storage_gpfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-storage_gpfs.rst rename to doc/source/configuration/tables/cinder-storage_gpfs.inc diff --git a/doc/source/configuration/tables/cinder-storage_nfs.rst b/doc/source/configuration/tables/cinder-storage_nfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-storage_nfs.rst rename to doc/source/configuration/tables/cinder-storage_nfs.inc diff --git a/doc/source/configuration/tables/cinder-storwize.rst b/doc/source/configuration/tables/cinder-storwize.inc similarity index 100% rename from doc/source/configuration/tables/cinder-storwize.rst rename to doc/source/configuration/tables/cinder-storwize.inc diff --git a/doc/source/configuration/tables/cinder-swift.rst b/doc/source/configuration/tables/cinder-swift.inc similarity index 100% rename from doc/source/configuration/tables/cinder-swift.rst rename to doc/source/configuration/tables/cinder-swift.inc diff --git a/doc/source/configuration/tables/cinder-synology.rst b/doc/source/configuration/tables/cinder-synology.inc similarity index 100% rename from doc/source/configuration/tables/cinder-synology.rst rename to doc/source/configuration/tables/cinder-synology.inc diff --git a/doc/source/configuration/tables/cinder-tegile.rst b/doc/source/configuration/tables/cinder-tegile.inc similarity index 100% rename from doc/source/configuration/tables/cinder-tegile.rst rename to doc/source/configuration/tables/cinder-tegile.inc diff --git a/doc/source/configuration/tables/cinder-tintri.rst b/doc/source/configuration/tables/cinder-tintri.inc similarity index 100% rename from doc/source/configuration/tables/cinder-tintri.rst rename to doc/source/configuration/tables/cinder-tintri.inc diff --git a/doc/source/configuration/tables/cinder-violin.rst b/doc/source/configuration/tables/cinder-violin.inc similarity index 100% rename from doc/source/configuration/tables/cinder-violin.rst rename to doc/source/configuration/tables/cinder-violin.inc diff --git a/doc/source/configuration/tables/cinder-vmware.rst b/doc/source/configuration/tables/cinder-vmware.inc similarity index 100% rename from doc/source/configuration/tables/cinder-vmware.rst rename to doc/source/configuration/tables/cinder-vmware.inc diff --git a/doc/source/configuration/tables/cinder-vzstorage.rst b/doc/source/configuration/tables/cinder-vzstorage.inc similarity index 100% rename from doc/source/configuration/tables/cinder-vzstorage.rst rename to doc/source/configuration/tables/cinder-vzstorage.inc diff --git a/doc/source/configuration/tables/cinder-windows.rst b/doc/source/configuration/tables/cinder-windows.inc similarity index 100% rename from doc/source/configuration/tables/cinder-windows.rst rename to doc/source/configuration/tables/cinder-windows.inc diff --git a/doc/source/configuration/tables/cinder-xio.rst b/doc/source/configuration/tables/cinder-xio.inc similarity index 100% rename from doc/source/configuration/tables/cinder-xio.rst rename to doc/source/configuration/tables/cinder-xio.inc diff --git a/doc/source/configuration/tables/cinder-zadara.rst b/doc/source/configuration/tables/cinder-zadara.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zadara.rst rename to doc/source/configuration/tables/cinder-zadara.inc diff --git a/doc/source/configuration/tables/cinder-zfssa-iscsi.rst b/doc/source/configuration/tables/cinder-zfssa-iscsi.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zfssa-iscsi.rst rename to doc/source/configuration/tables/cinder-zfssa-iscsi.inc diff --git a/doc/source/configuration/tables/cinder-zfssa-nfs.rst b/doc/source/configuration/tables/cinder-zfssa-nfs.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zfssa-nfs.rst rename to doc/source/configuration/tables/cinder-zfssa-nfs.inc diff --git a/doc/source/configuration/tables/cinder-zones.rst b/doc/source/configuration/tables/cinder-zones.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zones.rst rename to doc/source/configuration/tables/cinder-zones.inc diff --git a/doc/source/configuration/tables/cinder-zoning.rst b/doc/source/configuration/tables/cinder-zoning.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zoning.rst rename to doc/source/configuration/tables/cinder-zoning.inc diff --git a/doc/source/configuration/tables/cinder-zoning_fabric_brcd.rst b/doc/source/configuration/tables/cinder-zoning_fabric_brcd.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zoning_fabric_brcd.rst rename to doc/source/configuration/tables/cinder-zoning_fabric_brcd.inc diff --git a/doc/source/configuration/tables/cinder-zoning_fabric_cisco.rst b/doc/source/configuration/tables/cinder-zoning_fabric_cisco.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zoning_fabric_cisco.rst rename to doc/source/configuration/tables/cinder-zoning_fabric_cisco.inc diff --git a/doc/source/configuration/tables/cinder-zoning_manager_brcd.rst b/doc/source/configuration/tables/cinder-zoning_manager_brcd.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zoning_manager_brcd.rst rename to doc/source/configuration/tables/cinder-zoning_manager_brcd.inc diff --git a/doc/source/configuration/tables/cinder-zoning_manager_cisco.rst b/doc/source/configuration/tables/cinder-zoning_manager_cisco.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zoning_manager_cisco.rst rename to doc/source/configuration/tables/cinder-zoning_manager_cisco.inc diff --git a/doc/source/configuration/tables/cinder-zte.rst b/doc/source/configuration/tables/cinder-zte.inc similarity index 100% rename from doc/source/configuration/tables/cinder-zte.rst rename to doc/source/configuration/tables/cinder-zte.inc diff --git a/doc/source/configuration/tables/manual/cinder-netapp_cdot_extraspecs.rst b/doc/source/configuration/tables/manual/cinder-netapp_cdot_extraspecs.inc similarity index 100% rename from doc/source/configuration/tables/manual/cinder-netapp_cdot_extraspecs.rst rename to doc/source/configuration/tables/manual/cinder-netapp_cdot_extraspecs.inc