Merge "[config-ref] add ITRI DISCO volume driver"

doc/config-reference/source/block-storage/drivers/itri-disco-driver.rst

@@ -0,0 +1,23 @@
+========================
+ITRI DISCO volume driver
+========================
+
+Supported operations
+~~~~~~~~~~~~~~~~~~~~
+
+The DISCO driver supports the following features:
+
+* Volume create and delete
+* Volume attach and detach
+* Snapshot create and delete
+* Create volume from snapshot
+* Get volume stats
+* Copy image to volume
+* Copy volume to image
+* Clone volume
+* Extend volume
+
+Configuration options
+~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: ../../tables/cinder-disco.rst

doc/config-reference/source/block-storage/volume-drivers.rst

@@ -28,6 +28,7 @@ Volume drivers
    drivers/ibm-storwize-svc-driver.rst
    drivers/ibm-xiv-volume-driver.rst
    drivers/ibm-flashsystem-volume-driver.rst
+   drivers/itri-disco-driver.rst
    drivers/lenovo-driver.rst
    drivers/lvm-volume-driver.rst
    drivers/netapp-volume-driver.rst

doc/config-reference/source/block-storage/volume-misc.rst

@@ -16,7 +16,6 @@ These options can also be set in the ``cinder.conf`` file.
 .. include:: ../tables/cinder-cors.rst
 .. include:: ../tables/cinder-database.rst
 .. include:: ../tables/cinder-debug.rst
-.. include:: ../tables/cinder-disco.rst
 .. include:: ../tables/cinder-drbd.rst
 .. include:: ../tables/cinder-emc.rst
 .. include:: ../tables/cinder-eternus.rst