Merge "Update IBM Storage config parameters"

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

@@ -12,9 +12,9 @@ to configure it.
 
 .. code-block:: ini
 
-   volume_driver = cinder.volume.drivers.xiv_ds8k.XIVDS8KDriver
+   volume_driver = cinder.volume.drivers.ibm.ibm_storage.IBMStorageDriver
 
-.. include:: ../../tables/cinder-xiv.rst
+.. include:: ../../tables/cinder-ibm_storage.rst
 
 .. note::
 

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

@@ -35,7 +35,7 @@ Volume drivers
    drivers/huawei-storage-driver.rst
    drivers/ibm-gpfs-volume-driver.rst
    drivers/ibm-storwize-svc-driver.rst
-   drivers/ibm-xiv-volume-driver.rst
+   drivers/ibm-storage-volume-driver.rst
    drivers/ibm-flashsystem-volume-driver.rst
    drivers/itri-disco-driver.rst
    drivers/kaminario-driver.rst

tools/autogenerate-config-flagmappings/cinder.flagmappings

@@ -552,11 +552,11 @@ rpc_zmq_max_port zeromq
 rpc_zmq_min_port zeromq
 rpc_zmq_serialization zeromq
 rpc_zmq_topic_backlog zeromq
-san_clustername san xiv
-san_ip san prophetstor_dpl xiv
+san_clustername san ibm_storage
+san_ip san prophetstor_dpl ibm_storage
 san_is_local san
-san_login san prophetstor_dpl xiv
-san_password san prophetstor_dpl xiv
+san_login san prophetstor_dpl ibm_storage
+san_password san prophetstor_dpl ibm_storage
 san_private_key san
 san_ssh_port san
 san_thin_provision san prophetstor_dpl
@@ -727,6 +727,9 @@ vzstorage_sparsed_volumes vzstorage
 vzstorage_used_ratio vzstorage
 watch_log_file disable
 windows_iscsi_lun_path windows
+chap ibm_storage
+connection_type ibm_storage
+proxy ibm_storage
 xtremio_array_busy_retry_count emc_xtremio
 xtremio_array_busy_retry_interval emc_xtremio
 xtremio_cluster_name emc_xtremio

tools/autogenerate-config-flagmappings/cinder.headers

@@ -78,7 +78,7 @@ violin Violin volume driver
 vzstorage Virtuozzo Storage volume driver
 windows Windows
 xio X-IO volume driver
-xiv IBM Storage driver
+ibm_storage IBM Storage driver
 zadara Zadara Storage driver
 zfssa-iscsi ZFS Storage Appliance iSCSI driver
 zfssa-nfs ZFS Storage Appliance NFS driver