Merge "add Virtuozzo Storage to the list of supported Cinder volume drivers"

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

@@ -0,0 +1,14 @@
+========================
+Virtuozzo Storage driver
+========================
+
+The Virtuozzo Storage driver is a fault-tolerant distributed storage
+system that is optimized for virtualization workloads.
+Set the following in your ``cinder.conf`` file, and use the following
+options to configure it.
+
+.. code-block:: ini
+
+   volume_driver = cinder.volume.drivers.vzstorage.VZStorageDriver
+
+.. include:: ../../tables/cinder-vzstorage.rst

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

@@ -47,6 +47,7 @@ Volume drivers
    drivers/solidfire-volume-driver.rst
    drivers/tintri-volume-driver.rst
    drivers/violin-v7000-driver.rst
+   drivers/vzstorage-driver.rst
    drivers/vmware-vmdk-driver.rst
    drivers/windows-iscsi-volume-driver.rst
    drivers/xio-volume-driver.rst

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

@@ -40,6 +40,5 @@ These options can also be set in the ``cinder.conf`` file.
 .. include:: ../tables/cinder-scst.rst
 .. include:: ../tables/cinder-storage.rst
 .. include:: ../tables/cinder-tegile.rst
-.. include:: ../tables/cinder-vzstorage.rst
 .. include:: ../tables/cinder-zeromq.rst
 .. include:: ../tables/cinder-zones.rst

tools/autogenerate-config-flagmappings/cinder.headers

@@ -71,7 +71,7 @@ srb Scality REST Block storage driver
 tegile Tegile volume driver
 tintri Tintri volume driver
 violin Violin volume driver
-vzstorage VidZapper Storage volume driver
+vzstorage Virtuozzo Storage volume driver
 windows Windows
 xio X-IO volume driver
 xiv IBM Storage driver