[config-ref] update cinder config options for Ocata

Change-Id: Ib0491338c6b97bd812dee9078ae9030193d26ce1

doc/config-reference/source/tables/cinder-api.rst

@@ -26,7 +26,7 @@
      - (String) Backend override of host value.
    * - ``default_timeout`` = ``31536000``
      - (Integer) Default timeout for CLI operations in minutes. For example, LUN migration is a typical long running operation, which depends on the LUN size and the load of the array. An upper bound in the specific deployment can be set to avoid unnecessary long wait. By default, it is 365 days long.
-   * - ``enable_v1_api`` = ``True``
+   * - ``enable_v1_api`` = ``False``
      - (Boolean) DEPRECATED: Deploy v1 of the Cinder API.
    * - ``enable_v2_api`` = ``True``
      - (Boolean) DEPRECATED: Deploy v2 of the Cinder API.
@@ -42,8 +42,6 @@
      - (Integer) message minimum life in seconds.
    * - ``osapi_max_limit`` = ``1000``
      - (Integer) The maximum number of items that a collection resource returns in a single response
-   * - ``osapi_max_request_body_size`` = ``114688``
-     - (Integer) Max size for body of a request
    * - ``osapi_volume_base_URL`` = ``None``
      - (String) Base URL that will be presented to users in links to the OpenStack Volume API
    * - ``osapi_volume_ext_list`` =

doc/config-reference/source/tables/cinder-backups_swift.rst

@@ -45,7 +45,7 @@
    * - ``backup_swift_tenant`` = ``None``
      - (String) Swift tenant/account name. Required when connecting to an auth 2.0 system
    * - ``backup_swift_url`` = ``None``
-     - (String) The URL of the Swift endpoint
+     - (URI) The URL of the Swift endpoint
    * - ``backup_swift_user`` = ``None``
      - (String) Swift user name
    * - ``backup_swift_user_domain`` = ``None``

doc/config-reference/source/tables/cinder-common.rst

@@ -91,7 +91,7 @@
    * - ``num_shell_tries`` = ``3``
      - (Integer) Number of times to attempt to run flakey shell commands
    * - ``os_privileged_user_auth_url`` = ``None``
-     - (String) Auth URL associated with the OpenStack privileged account.
+     - (URI) Auth URL associated with the OpenStack privileged account.
    * - ``os_privileged_user_name`` = ``None``
      - (String) OpenStack privileged account username. Used for requests to other services (such as Nova) that require an account with special rights.
    * - ``os_privileged_user_password`` = ``None``
@@ -102,8 +102,6 @@
      - (Integer) Range, in seconds, to randomly delay when starting the periodic task scheduler to reduce stampeding. (Disable by setting to 0)
    * - ``periodic_interval`` = ``60``
      - (Integer) Interval, in seconds, between running periodic tasks
-   * - ``replication_api_class`` = ``cinder.replication.api.API``
-     - (String) The full class name of the volume replication API class
    * - ``replication_device`` = ``None``
      - (Unknown) Multi opt of dictionaries to represent a replication target device. This option may be specified multiple times in a single config section to specify multiple replication target devices. Each entry takes the standard dict config form: replication_device = target_device_id:<required>,key1:value1,key2:value2...
    * - ``report_discard_supported`` = ``False``
@@ -144,6 +142,18 @@
      - (Boolean) Option to enable/disable CHAP authentication for targets.
    * - ``use_forwarded_for`` = ``False``
      - (Boolean) Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.
+   * - **[healthcheck]**
+     -
+   * - ``backends`` =
+     - (List) Additional backends that can perform health checks and report that information back as part of a request.
+   * - ``detailed`` = ``False``
+     - (Boolean) Show more detailed information as part of the response
+   * - ``disable_by_file_path`` = ``None``
+     - (String) Check the presence of a file to determine if an application is running on a port. Used by DisableByFileHealthcheck plugin.
+   * - ``disable_by_file_paths`` =
+     - (List) Check the presence of a file based on a port to determine if an application is running on a port. Expects a "port:path" list of strings. Used by DisableByFilesPortsHealthcheck plugin.
+   * - ``path`` = ``/healthcheck``
+     - (String) DEPRECATED: The path to respond to healtcheck requests on.
    * - **[key_manager]**
      -
    * - ``api_class`` = ``castellan.key_manager.barbican_key_manager.BarbicanKeyManager``

doc/config-reference/source/tables/cinder-datera.rst

@@ -22,15 +22,13 @@
      - (Integer) Interval between 503 retries
    * - ``datera_503_timeout`` = ``120``
      - (Integer) Timeout for HTTP 503 retry messages
-   * - ``datera_acl_allow_all`` = ``False``
-     - (Boolean) DEPRECATED: True to set acl 'allow_all' on volumes created
    * - ``datera_api_port`` = ``7717``
      - (String) Datera API port.
    * - ``datera_api_version`` = ``2``
-     - (String) Datera API version.
+     - (String) DEPRECATED: Datera API version.
    * - ``datera_debug`` = ``False``
      - (Boolean) True to set function arg and return logging
    * - ``datera_debug_replica_count_override`` = ``False``
      - (Boolean) ONLY FOR DEBUG/TESTING PURPOSES True to set replica_count to 1
-   * - ``datera_num_replicas`` = ``3``
-     - (Integer) DEPRECATED: Number of replicas to create of an inode.
+   * - ``datera_tenant_id`` = ``None``
+     - (String) If set to 'Map' --> OpenStack project ID will be mapped implicitly to Datera tenant ID If set to 'None' --> Datera tenant ID will not be used during volume provisioning If set to anything else --> Datera tenant ID will be the provided value

doc/config-reference/source/tables/cinder-dell_emc_unity.rst

@@ -18,5 +18,7 @@
      - Description
    * - **[DEFAULT]**
      -
+   * - ``unity_io_ports`` = ``None``
+     - (List) A comma-separated list of iSCSI or FC ports to be used. Each port can be Unix-style glob expressions.
    * - ``unity_storage_pool_names`` = ``None``
      - (List) A comma-separated list of storage pool names to be used.

doc/config-reference/source/tables/cinder-disco.rst

@@ -18,6 +18,8 @@
      - Description
    * - **[DEFAULT]**
      -
+   * - ``choice_client`` = ``None``
+     - (String) Use soap client or rest client for communicating with DISCO. Possible values are "soap" or "rest".
    * - ``clone_check_timeout`` = ``3600``
      - (Integer) How long we check whether a clone is finished before we give up
    * - ``clone_volume_timeout`` = ``680``
@@ -26,8 +28,12 @@
      - (IP) The IP of DMS client socket server
    * - ``disco_client_port`` = ``9898``
      - (Port number) The port to connect DMS client socket server
+   * - ``disco_src_api_port`` = ``8080``
+     - (Port number) The port of DISCO source API
    * - ``disco_wsdl_path`` = ``/etc/cinder/DISCOService.wsdl``
-     - (String) Path to the wsdl file to communicate with DISCO request manager
+     - (String) DEPRECATED: Path to the wsdl file to communicate with DISCO request manager
+   * - ``rest_ip`` = ``None``
+     - (IP) The IP address of the REST server
    * - ``restore_check_timeout`` = ``3600``
      - (Integer) How long we check whether a restore is finished before we give up
    * - ``retry_interval`` = ``1``

doc/config-reference/source/tables/cinder-emc.rst

@@ -21,7 +21,7 @@
    * - ``check_max_pool_luns_threshold`` = ``False``
      - (Boolean) Report free_capacity_gb as 0 when the limit to maximum number of pool LUNs is reached. By default, the value is False.
    * - ``cinder_emc_config_file`` = ``/etc/cinder/cinder_emc_config.xml``
-     - (String) use this file for cinder emc plugin config data
+     - (String) Use this file for cinder emc plugin config data
    * - ``destroy_empty_storage_group`` = ``False``
      - (Boolean) To destroy storage group when the last LUN is removed from it. By default, the value is False.
    * - ``force_delete_lun_in_storagegroup`` = ``False``
@@ -36,6 +36,8 @@
      - (String) Mapping between hostname and its iSCSI initiator IP addresses.
    * - ``max_luns_per_storage_group`` = ``255``
      - (Integer) Default max number of LUNs in a storage group. By default, the value is 255.
+   * - ``multi_pool_support`` = ``False``
+     - (String) Use this value to specify multi-pool support for VMAX3
    * - ``naviseccli_path`` = ``None``
      - (String) Naviseccli Path.
    * - ``storage_vnx_authentication_type`` = ``global``

doc/config-reference/source/tables/cinder-eqlx.rst

@@ -18,17 +18,9 @@
      - Description
    * - **[DEFAULT]**
      -
-   * - ``eqlx_chap_login`` = ``admin``
-     - (String) Existing CHAP account name. Note that this option is deprecated in favour of "chap_username" as specified in cinder/volume/driver.py and will be removed in next release.
-   * - ``eqlx_chap_password`` = ``password``
-     - (String) Password for specified CHAP account name. Note that this option is deprecated in favour of "chap_password" as specified in cinder/volume/driver.py and will be removed in the next release
    * - ``eqlx_cli_max_retries`` = ``5``
      - (Integer) Maximum retry count for reconnection. Default is 5.
-   * - ``eqlx_cli_timeout`` = ``30``
-     - (Integer) Timeout for the Group Manager cli command execution. Default is 30. Note that this option is deprecated in favour of "ssh_conn_timeout" as specified in cinder/volume/drivers/san/san.py and will be removed in M release.
    * - ``eqlx_group_name`` = ``group-0``
      - (String) Group name to use for creating volumes. Defaults to "group-0".
    * - ``eqlx_pool`` = ``default``
      - (String) Pool in which volumes will be created. Defaults to "default".
-   * - ``eqlx_use_chap`` = ``False``
-     - (Boolean) Use CHAP authentication for targets. Note that this option is deprecated in favour of "use_chap_auth" as specified in cinder/volume/driver.py and will be removed in next release.

doc/config-reference/source/tables/cinder-falconstor.rst

@@ -24,3 +24,5 @@
      - (Boolean) Enable HTTP debugging to FSS
    * - ``fss_pool`` =
      - (Integer) FSS pool id in which FalconStor volumes are stored.
+   * - ``fss_san_secondary_ip`` =
+     - (String) Specifies FSS secondary management IP to be used if san_ip is invalid or becomes inaccessible.

doc/config-reference/source/tables/cinder-hitachi-hnas.rst

@@ -40,25 +40,25 @@
      - (String) Service 0 HDP
    * - ``hnas_svc0_iscsi_ip`` = ``None``
      - (IP) Service 0 iSCSI IP
-   * - ``hnas_svc0_volume_type`` = ``None``
-     - (String) Service 0 volume type
+   * - ``hnas_svc0_pool_name`` = ``None``
+     - (String) Service 0 pool name
    * - ``hnas_svc1_hdp`` = ``None``
      - (String) Service 1 HDP
    * - ``hnas_svc1_iscsi_ip`` = ``None``
      - (IP) Service 1 iSCSI IP
-   * - ``hnas_svc1_volume_type`` = ``None``
-     - (String) Service 1 volume type
+   * - ``hnas_svc1_pool_name`` = ``None``
+     - (String) Service 1 pool name
    * - ``hnas_svc2_hdp`` = ``None``
      - (String) Service 2 HDP
    * - ``hnas_svc2_iscsi_ip`` = ``None``
      - (IP) Service 2 iSCSI IP
-   * - ``hnas_svc2_volume_type`` = ``None``
-     - (String) Service 2 volume type
+   * - ``hnas_svc2_pool_name`` = ``None``
+     - (String) Service 2 pool name
    * - ``hnas_svc3_hdp`` = ``None``
      - (String) Service 3 HDP
    * - ``hnas_svc3_iscsi_ip`` = ``None``
      - (IP) Service 3 iSCSI IP
-   * - ``hnas_svc3_volume_type`` = ``None``
-     - (String) Service 3 volume type
+   * - ``hnas_svc3_pool_name`` = ``None``
+     - (String) Service 3 pool name:
    * - ``hnas_username`` = ``None``
      - (String) HNAS username.

doc/config-reference/source/tables/cinder-hitachi-vsp.rst

@@ -0,0 +1,60 @@
+..
+    Warning: Do not edit this file. It is automatically generated from the
+    software project's code and your changes will be overwritten.
+
+    The tool to generate this file lives in openstack-doc-tools repository.
+
+    Please make any changes needed in the code, then run the
+    autogenerate-config-doc tool from the openstack-doc-tools repository, or
+    ask for help on the documentation mailing list, IRC channel or meeting.
+
+.. _cinder-hitachi-vsp:
+
+.. list-table:: Description of HORCM interface module for Hitachi VSP driver configuration options
+   :header-rows: 1
+   :class: config-ref-table
+
+   * - Configuration option = Default value
+     - Description
+   * - **[DEFAULT]**
+     -
+   * - ``vsp_async_copy_check_interval`` = ``10``
+     - (Integer) Interval in seconds at which volume pair synchronization status is checked when volume pairs are deleted.
+   * - ``vsp_auth_password`` = ``None``
+     - (String) Password corresponding to vsp_auth_user.
+   * - ``vsp_auth_user`` = ``None``
+     - (String) Name of the user used for CHAP authentication performed in communication between hosts and iSCSI targets on the storage ports.
+   * - ``vsp_compute_target_ports`` = ``None``
+     - (List) IDs of the storage ports used to attach volumes to compute nodes. To specify multiple ports, connect them by commas (e.g. CL1-A,CL2-A).
+   * - ``vsp_copy_check_interval`` = ``3``
+     - (Integer) Interval in seconds at which volume pair synchronization status is checked when volume pairs are created.
+   * - ``vsp_copy_speed`` = ``3``
+     - (Integer) Speed at which data is copied by Shadow Image. 1 or 2 indicates low speed, 3 indicates middle speed, and a value between 4 and 15 indicates high speed.
+   * - ``vsp_default_copy_method`` = ``FULL``
+     - (String) Method of volume copy. FULL indicates full data copy by Shadow Image and THIN indicates differential data copy by Thin Image.
+   * - ``vsp_group_request`` = ``False``
+     - (Boolean) If True, the driver will create host groups or iSCSI targets on storage ports as needed.
+   * - ``vsp_horcm_add_conf`` = ``True``
+     - (Boolean) If True, the driver will create or update the Command Control Interface configuration file as needed.
+   * - ``vsp_horcm_numbers`` = ``200, 201``
+     - (List) Command Control Interface instance numbers in the format of 'xxx,yyy'. The second one is for Shadow Image operation and the first one is for other purposes.
+   * - ``vsp_horcm_pair_target_ports`` = ``None``
+     - (List) IDs of the storage ports used to copy volumes by Shadow Image or Thin Image. To specify multiple ports, connect them by commas (e.g. CL1-A,CL2-A).
+   * - ``vsp_horcm_password`` = ``None``
+     - (String) Password corresponding to vsp_horcm_user.
+   * - ``vsp_horcm_user`` = ``None``
+     - (String) Name of the user on the storage system.
+   * - ``vsp_ldev_range`` = ``None``
+     - (String) Range of the LDEV numbers in the format of 'xxxx-yyyy' that can be used by the driver. Values can be in decimal format (e.g. 1000) or in colon-separated hexadecimal format (e.g. 00:03:E8).
+   * - ``vsp_pool`` = ``None``
+     - (String) Pool number or pool name of the DP pool.
+   * - ``vsp_storage_id`` = ``None``
+     - (String) Product number of the storage system.
+   * - ``vsp_target_ports`` = ``None``
+     - (List) IDs of the storage ports used to attach volumes to the controller node. To specify multiple ports, connect them by commas (e.g. CL1-A,CL2-A).
+   * - ``vsp_thin_pool`` = ``None``
+     - (String) Pool number or pool name of the Thin Image pool.
+   * - ``vsp_use_chap_auth`` = ``False``
+     - (Boolean) If True, CHAP authentication will be applied to communication between hosts and any of the iSCSI targets on the storage ports.
+   * - ``vsp_zoning_request`` = ``False``
+     - (Boolean) If True, the driver will configure FC zoning between the server and the storage system provided that FC zoning manager is enabled.

doc/config-reference/source/tables/cinder-hpelefthand.rst

@@ -19,7 +19,7 @@
    * - **[DEFAULT]**
      -
    * - ``hpelefthand_api_url`` = ``None``
-     - (String) HPE LeftHand WSAPI Server Url like https://<LeftHand ip>:8081/lhos
+     - (URI) HPE LeftHand WSAPI Server Url like https://<LeftHand ip>:8081/lhos
    * - ``hpelefthand_clustername`` = ``None``
      - (String) HPE LeftHand cluster name
    * - ``hpelefthand_debug`` = ``False``

doc/config-reference/source/tables/cinder-ibm_storage.rst

@@ -18,7 +18,13 @@
      - Description
    * - **[DEFAULT]**
      -
-   * - ``proxy`` = ``storage.proxy.IBMStorageProxy``
+   * - ``ds8k_devadd_unitadd_mapping`` =
+     - (String) Mapping between IODevice address and unit address.
+   * - ``ds8k_host_type`` = ``auto``
+     - (String) Set to zLinux if your OpenStack version is prior to Liberty and you're connecting to zLinux systems. Otherwise set to auto. Valid values for this parameter are: 'auto', 'AMDLinuxRHEL', 'AMDLinuxSuse', 'AppleOSX', 'Fujitsu', 'Hp', 'HpTru64', 'HpVms', 'LinuxDT', 'LinuxRF', 'LinuxRHEL', 'LinuxSuse', 'Novell', 'SGI', 'SVC', 'SanFsAIX', 'SanFsLinux', 'Sun', 'VMWare', 'Win2000', 'Win2003', 'Win2008', 'Win2012', 'iLinux', 'nSeries', 'pLinux', 'pSeries', 'pSeriesPowerswap', 'zLinux', 'iSeries'.
+   * - ``ds8k_ssid_prefix`` = ``FF``
+     - (String) Set the first two digits of SSID
+   * - ``proxy`` = ``cinder.volume.drivers.ibm.ibm_storage.proxy.IBMStorageProxy``
      - (String) Proxy driver that connects to the IBM Storage Array
    * - ``san_clustername`` =
      - (String) Cluster name to use for creating volumes

doc/config-reference/source/tables/cinder-images.rst

@@ -19,7 +19,7 @@
    * - **[DEFAULT]**
      -
    * - ``allowed_direct_url_schemes`` =
-     - (List) A list of url schemes that can be downloaded directly via the direct_url. Currently supported schemes: [file].
+     - (List) A list of url schemes that can be downloaded directly via the direct_url. Currently supported schemes: [file, cinder].
    * - ``glance_api_insecure`` = ``False``
      - (Boolean) Allow to perform insecure SSL (https) requests to glance (https will be used but cert validation will not be performed).
    * - ``glance_api_servers`` = ``None``

doc/config-reference/source/tables/cinder-infinidat.rst

@@ -0,0 +1,22 @@
+..
+    Warning: Do not edit this file. It is automatically generated from the
+    software project's code and your changes will be overwritten.
+
+    The tool to generate this file lives in openstack-doc-tools repository.
+
+    Please make any changes needed in the code, then run the
+    autogenerate-config-doc tool from the openstack-doc-tools repository, or
+    ask for help on the documentation mailing list, IRC channel or meeting.
+
+.. _cinder-infinidat:
+
+.. list-table:: Description of INFINIDAT InfiniBox volume driver configuration options
+   :header-rows: 1
+   :class: config-ref-table
+
+   * - Configuration option = Default value
+     - Description
+   * - **[DEFAULT]**
+     -
+   * - ``infinidat_pool_name`` = ``None``
+     - (String) Name of the pool from which volumes are allocated

doc/config-reference/source/tables/cinder-nexenta.rst

@@ -42,8 +42,8 @@
      - (Boolean) If set True cache NexentaStor appliance volroot option value.
    * - ``nexenta_password`` = ``nexenta``
      - (String) Password to connect to Nexenta SA
-   * - ``nexenta_rest_port`` = ``8080``
-     - (Integer) HTTP port to connect to Nexenta REST API server
+   * - ``nexenta_rest_port`` = ``0``
+     - (Integer) HTTP(S) port to connect to Nexenta REST API server. If it is equal zero, 8443 for HTTPS and 8080 for HTTP is used
    * - ``nexenta_rest_protocol`` = ``auto``
      - (String) Use http or https for REST connection (default auto)
    * - ``nexenta_rrmgr_compression`` = ``0``
@@ -62,6 +62,8 @@
      - (String) Prefix for iSCSI target groups on SA
    * - ``nexenta_target_prefix`` = ``iqn.1986-03.com.sun:02:cinder-``
      - (String) IQN prefix for iSCSI targets
+   * - ``nexenta_use_https`` = ``True``
+     - (Boolean) Use secure HTTP for REST connection (default True)
    * - ``nexenta_user`` = ``admin``
      - (String) User name to connect to Nexenta SA
    * - ``nexenta_volume`` = ``cinder``

doc/config-reference/source/tables/cinder-nexenta5.rst

@@ -32,14 +32,16 @@
      - (String) Base directory that contains NFS share mount points
    * - ``nexenta_ns5_blocksize`` = ``32``
      - (Integer) Block size for datasets
-   * - ``nexenta_rest_port`` = ``8080``
-     - (Integer) HTTP port to connect to Nexenta REST API server
+   * - ``nexenta_rest_port`` = ``0``
+     - (Integer) HTTP(S) port to connect to Nexenta REST API server. If it is equal zero, 8443 for HTTPS and 8080 for HTTP is used
    * - ``nexenta_rest_protocol`` = ``auto``
      - (String) Use http or https for REST connection (default auto)
    * - ``nexenta_sparse`` = ``False``
      - (Boolean) Enables or disables the creation of sparse datasets
    * - ``nexenta_sparsed_volumes`` = ``True``
      - (Boolean) Enables or disables the creation of volumes as sparsed files that take no space. If disabled (False), volume is created as a regular file, which takes a long time.
+   * - ``nexenta_use_https`` = ``True``
+     - (Boolean) Use secure HTTP for REST connection (default True)
    * - ``nexenta_user`` = ``admin``
      - (String) User name to connect to Nexenta SA
    * - ``nexenta_volume`` = ``cinder``

doc/config-reference/source/tables/cinder-nexenta_edge.rst

@@ -34,8 +34,8 @@
      - (String) IP address of NexentaEdge management REST API endpoint
    * - ``nexenta_rest_password`` = ``nexenta``
      - (String) Password to connect to NexentaEdge
-   * - ``nexenta_rest_port`` = ``8080``
-     - (Integer) HTTP port to connect to Nexenta REST API server
+   * - ``nexenta_rest_port`` = ``0``
+     - (Integer) HTTP(S) port to connect to Nexenta REST API server. If it is equal zero, 8443 for HTTPS and 8080 for HTTP is used
    * - ``nexenta_rest_protocol`` = ``auto``
      - (String) Use http or https for REST connection (default auto)
    * - ``nexenta_rest_user`` = ``admin``

doc/config-reference/source/tables/cinder-nimble.rst

@@ -22,3 +22,7 @@
      - (String) Nimble Controller pool name
    * - ``nimble_subnet_label`` = ``*``
      - (String) Nimble Subnet Label
+   * - ``nimble_verify_cert_path`` = ``None``
+     - (String) Path to Nimble Array SSL certificate
+   * - ``nimble_verify_certificate`` = ``False``
+     - (String) Whether to verify Nimble SSL Certificate

doc/config-reference/source/tables/cinder-profiler.rst

@@ -24,6 +24,10 @@
        Examples of possible values:
 
        * messaging://: use oslo_messaging driver for sending notifications.
+
+       * mongodb://127.0.0.1:27017 : use mongodb driver for sending notifications.
+
+       * elasticsearch://127.0.0.1:9200 : use elasticsearch driver for sending notifications.
    * - ``enabled`` = ``False``
      - (Boolean) Enables the profiling for all services on this node. Default value is False (fully disable the profiling feature).
 
@@ -32,10 +36,20 @@
        * True: Enables the feature
 
        * False: Disables the feature. The profiling cannot be started via this project operations. If the profiling is triggered by another project, this project part will be empty.
+   * - ``es_doc_type`` = ``notification``
+     - (String) Document type for notification indexing in elasticsearch.
+   * - ``es_scroll_size`` = ``10000``
+     - (Integer) Elasticsearch splits large requests in batches. This parameter defines maximum size of each batch (for example: es_scroll_size=10000).
+   * - ``es_scroll_time`` = ``2m``
+     - (String) This parameter is a time value parameter (for example: es_scroll_time=2m), indicating for how long the nodes that participate in the search will maintain relevant resources in order to continue and support it.
    * - ``hmac_keys`` = ``SECRET_KEY``
      - (String) Secret key(s) to use for encrypting context data for performance profiling. This string value should have the following format: <key1>[,<key2>,...<keyn>], where each key is some random string. A user who triggers the profiling via the REST API has to set one of these keys in the headers of the REST API call to include profiling results of this node for this particular project.
 
        Both "enabled" flag and "hmac_keys" config options should be set to enable profiling. Also, to generate correct profiling information across all services at least one key needs to be consistent between OpenStack projects. This ensures it can be used from client side to generate the trace, containing information from all possible resources.
+   * - ``sentinel_service_name`` = ``mymaster``
+     - (String) Redissentinel uses a service name to identify a master redis service. This parameter defines the name (for example: sentinal_service_name=mymaster).
+   * - ``socket_timeout`` = ``0.1``
+     - (Floating point) Redissentinel provides a timeout option on the connections. This parameter defines that timeout (for example: socket_timeout=0.1).
    * - ``trace_sqlalchemy`` = ``False``
      - (Boolean) Enables SQL requests profiling in services. Default value is False (SQL requests won't be traced).
 

doc/config-reference/source/tables/cinder-qnap.rst

@@ -0,0 +1,26 @@
+..
+    Warning: Do not edit this file. It is automatically generated from the
+    software project's code and your changes will be overwritten.
+
+    The tool to generate this file lives in openstack-doc-tools repository.
+
+    Please make any changes needed in the code, then run the
+    autogenerate-config-doc tool from the openstack-doc-tools repository, or
+    ask for help on the documentation mailing list, IRC channel or meeting.
+
+.. _cinder-qnap:
+
+.. list-table:: Description of QNAP storage volume driver configuration options
+   :header-rows: 1
+   :class: config-ref-table
+
+   * - Configuration option = Default value
+     - Description
+   * - **[DEFAULT]**
+     -
+   * - ``qnap_management_url`` = ``None``
+     - (URI) The URL to management QNAP Storage
+   * - ``qnap_poolname`` = ``None``
+     - (String) The pool name in the QNAP Storage
+   * - ``qnap_storage_protocol`` = ``iscsi``
+     - (String) Communication protocol to access QNAP storage

doc/config-reference/source/tables/cinder-quobyte.rst

@@ -27,4 +27,4 @@
    * - ``quobyte_sparsed_volumes`` = ``True``
      - (Boolean) Create volumes as sparse files which take no space. If set to False, volume is created as regular file.In such case volume creation takes a lot of time.
    * - ``quobyte_volume_url`` = ``None``
-     - (String) URL to the Quobyte volume e.g., quobyte://<DIR host>/<volume name>
+     - (URI) URL to the Quobyte volume e.g., quobyte://<DIR host>/<volume name>

doc/config-reference/source/tables/cinder-redis.rst

@@ -29,8 +29,8 @@
    * - ``sentinel_group_name`` = ``oslo-messaging-zeromq``
      - (String) Redis replica set name.
    * - ``sentinel_hosts`` =
-     - (List) DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode) e.g. [host:port, host1:port ... ] Replaced by [DEFAULT]/transport_url
+     - (List) DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode), e.g., [host:port, host1:port ... ] Replaced by [DEFAULT]/transport_url
    * - ``socket_timeout`` = ``10000``
-     - (Integer) Timeout in ms on blocking socket operations
+     - (Integer) Timeout in ms on blocking socket operations.
    * - ``wait_timeout`` = ``2000``
      - (Integer) Time in ms to wait between connection attempts.

doc/config-reference/source/tables/cinder-storage_ceph.rst

@@ -40,5 +40,5 @@
      - (Integer) Volumes will be chunked into objects of this size (in megabytes).
    * - ``rbd_user`` = ``None``
      - (String) The RADOS client name for accessing rbd volumes - only set when using cephx authentication
-   * - ``volume_tmp_dir`` = ``None``
-     - (String) Directory where temporary image files are stored when the volume driver does not write them directly to the volume. Warning: this option is now deprecated, please use image_conversion_dir instead.
+   * - ``replication_connect_timeout`` = ``5``
+     - (Integer) Timeout value (in seconds) used when connecting to ceph cluster to do a demotion/promotion of volumes. If value < 0, no timeout is set and default librados value is used.

doc/config-reference/source/tables/cinder-storage_glusterfs.rst

@@ -18,9 +18,5 @@
      - Description
    * - **[DEFAULT]**
      -
-   * - ``glusterfs_mount_point_base`` = ``$state_path/mnt``
-     - (String) Base dir containing mount points for gluster shares.
-   * - ``glusterfs_shares_config`` = ``/etc/cinder/glusterfs_shares``
-     - (String) File with the list of available gluster shares
    * - ``nas_volume_prov_type`` = ``thin``
      - (String) Provisioning type that will be used when creating volumes.

doc/config-reference/source/tables/cinder-storage_nfs.rst

@@ -24,7 +24,11 @@
      - (String) Mount options passed to the NFS client. See section of the NFS man page for details.
    * - ``nfs_mount_point_base`` = ``$state_path/mnt``
      - (String) Base dir containing mount points for NFS shares.
+   * - ``nfs_qcow2_volumes`` = ``False``
+     - (Boolean) Create volumes as QCOW2 files rather than raw files.
    * - ``nfs_shares_config`` = ``/etc/cinder/nfs_shares``
-     - (String) File with the list of available NFS shares
+     - (String) File with the list of available NFS shares.
+   * - ``nfs_snapshot_support`` = ``False``
+     - (Boolean) Enable support for snapshots on the NFS driver. Platforms using libvirt <1.2.7 will encounter issues with this feature.
    * - ``nfs_sparsed_volumes`` = ``True``
-     - (Boolean) Create volumes as sparsed files which take no space.If set to False volume is created as regular file.In such case volume creation takes a lot of time.
+     - (Boolean) Create volumes as sparsed files which take no space. If set to False volume is created as regular file. In such case volume creation takes a lot of time.

doc/config-reference/source/tables/cinder-swift.rst

@@ -21,4 +21,4 @@
    * - ``backup_swift_auth_insecure`` = ``False``
      - (Boolean) Bypass verification of server certificate when making SSL connection to Swift.
    * - ``backup_swift_auth_url`` = ``None``
-     - (String) The URL of the Keystone endpoint
+     - (URI) The URL of the Keystone endpoint

doc/config-reference/source/tables/cinder-vmware.rst

@@ -24,6 +24,8 @@
      - (String) CA bundle file to use in verifying the vCenter server certificate.
    * - ``vmware_cluster_name`` = ``None``
      - (Multi-valued) Name of a vCenter compute cluster where volumes should be created.
+   * - ``vmware_connection_pool_size`` = ``10``
+     - (Integer) Maximum number of connections in http connection pool.
    * - ``vmware_host_ip`` = ``None``
      - (String) IP address for connecting to VMware vCenter server.
    * - ``vmware_host_password`` = ``None``

tools/autogenerate-config-flagmappings/cinder.flagmappings

@@ -94,6 +94,7 @@ chap_password common
 chap_username common
 check_max_pool_luns_threshold emc
 chiscsi_conf common
+choice_client disco
 cinder_emc_config_file emc
 cinder_eternus_config_file eternus
 cinder_huawei_conf_file huawei
@@ -124,12 +125,11 @@ coprhd_username coprhd
 coprhd_varray coprhd
 datera_503_interval datera
 datera_503_timeout datera
-datera_acl_allow_all datera
 datera_api_port datera
 datera_api_version datera
 datera_debug datera
 datera_debug_replica_count_override datera
-datera_num_replicas datera
+datera_tenant_id datera
 db_driver disable
 debug disable
 default_availability_zone common
@@ -146,6 +146,7 @@ dell_server_os dellsc
 destroy_empty_storage_group emc
 disco_client disco
 disco_client_port disco
+disco_src_api_port disco
 disco_wsdl_path disco
 dothill_api_protocol dothill
 dothill_backend_name dothill
@@ -172,6 +173,9 @@ driver_data_namespace common
 driver_ssl_cert_path common
 driver_ssl_cert_verify common
 driver_use_ssl xio
+ds8k_devadd_unitadd_mapping ibm_storage
+ds8k_host_type ibm_storage
+ds8k_ssid_prefix ibm_storage
 dsware_isthin fusionio
 dsware_manager fusionio
 enable_force_upload common
@@ -183,13 +187,9 @@ enable_v3_api api
 enabled_backends storage
 end_time common
 enforce_multipath_for_image_xfer common
-eqlx_chap_login eqlx
-eqlx_chap_password eqlx
 eqlx_cli_max_retries eqlx
-eqlx_cli_timeout eqlx
 eqlx_group_name eqlx
 eqlx_pool eqlx
-eqlx_use_chap eqlx
 excluded_domain_ip dellsc
 executor_thread_pool_size common
 expiry_thres_minutes netapp_7mode_nfs netapp_cdot_nfs
@@ -204,6 +204,7 @@ flashsystem_multipath_enabled flashsystem
 force_delete_lun_in_storagegroup emc
 fss_debug falconstor
 fss_pool falconstor
+fss_san_secondary_ip falconstor
 fusionstorageagent fusionio
 glance_api_insecure images
 glance_api_servers images
@@ -216,8 +217,6 @@ glance_num_retries images
 glance_request_timeout images
 glusterfs_backup_mount_point backups_glusterfs
 glusterfs_backup_share backups_glusterfs
-glusterfs_mount_point_base storage_glusterfs
-glusterfs_shares_config storage_glusterfs
 goodness_function scheduler
 gpfs_images_dir storage_gpfs
 gpfs_images_share_mode storage_gpfs
@@ -265,16 +264,16 @@ hnas_ssh_port hitachi-hnas
 hnas_ssh_private_key hitachi-hnas
 hnas_svc0_hdp hitachi-hnas
 hnas_svc0_iscsi_ip hitachi-hnas
-hnas_svc0_volume_type hitachi-hnas
+hnas_svc0_pool_name hitachi-hnas
 hnas_svc1_hdp hitachi-hnas
 hnas_svc1_iscsi_ip hitachi-hnas
-hnas_svc1_volume_type hitachi-hnas
+hnas_svc1_pool_name hitachi-hnas
 hnas_svc2_hdp hitachi-hnas
 hnas_svc2_iscsi_ip hitachi-hnas
-hnas_svc2_volume_type hitachi-hnas
+hnas_svc2_pool_name hitachi-hnas
 hnas_svc3_hdp hitachi-hnas
 hnas_svc3_iscsi_ip hitachi-hnas
-hnas_svc3_volume_type hitachi-hnas
+hnas_svc3_pool_name hitachi-hnas
 hnas_username hitachi-hnas
 host common
 hpe3par_api_url hpe3par
@@ -327,6 +326,7 @@ image_upload_use_internal_tenant images
 image_volume_cache_enabled images
 image_volume_cache_max_count images
 image_volume_cache_max_size_gb images
+infinidat_pool_name infinidat
 infortrend_cli_max_retries infortrend
 infortrend_cli_path infortrend
 infortrend_cli_timeout infortrend
@@ -393,6 +393,7 @@ metro_storage_pools huawei
 migration_create_volume_timeout_secs storage
 monkey_patch common
 monkey_patch_modules common
+multi_pool_support emc
 my_ip common
 nas_host nas storage_gpfs
 nas_login nas storage_gpfs
@@ -474,16 +475,21 @@ nexenta_sparse nexenta nexenta5
 nexenta_sparsed_volumes nexenta nexenta5
 nexenta_target_group_prefix nexenta
 nexenta_target_prefix nexenta
+nexenta_use_https nexenta nexenta5
 nexenta_user nexenta nexenta5
 nexenta_volume nexenta nexenta5
 nexenta_volume_group nexenta5
 nfs_mount_attempts storage_nfs
 nfs_mount_options storage_nfs
 nfs_mount_point_base storage_nfs
+nfs_qcow2_volumes storage_nfs
 nfs_shares_config storage_nfs
+nfs_snapshot_support storage_nfs
 nfs_sparsed_volumes storage_nfs
 nimble_pool_name nimble
 nimble_subnet_label nimble
+nimble_verify_cert_path nimble
+nimble_verify_certificate nimble
 no_snapshot_gb_quota common
 nova_api_insecure compute
 nova_ca_certificates_file compute
@@ -500,7 +506,6 @@ os_privileged_user_password common
 os_privileged_user_tenant common
 os_region_name compute
 osapi_max_limit api
-osapi_max_request_body_size api
 osapi_volume_base_URL api
 osapi_volume_ext_list api
 osapi_volume_extension api
@@ -523,6 +528,9 @@ pure_replica_interval_default pure
 pure_replica_retention_long_term_default pure
 pure_replica_retention_long_term_per_day_default pure
 pure_replica_retention_short_term_default pure
+qnap_management_url qnap
+qnap_poolname qnap
+qnap_storage_protocol qnap
 query_volume_filters api
 quobyte_client_cfg quobyte
 quobyte_mount_point_base quobyte
@@ -540,6 +548,9 @@ quota_volumes quota
 rados_connect_timeout storage_ceph
 rados_connection_interval storage_ceph
 rados_connection_retries storage_ceph
+rate_limit_burst disable
+rate_limit_except_level disable
+rate_limit_interval disable
 rbd_ceph_conf storage_ceph
 rbd_cluster_name storage_ceph
 rbd_flatten_volume_from_snapshot storage_ceph
@@ -548,21 +559,27 @@ rbd_pool storage_ceph
 rbd_secret_uuid storage_ceph
 rbd_store_chunk_size storage_ceph
 rbd_user storage_ceph
-replication_api_class common
+replication_connect_timeout storage_ceph
 replication_device common
 report_discard_supported common
 report_interval common
 reservation_expire quota
 reserved_percentage common
+rest_ip disco
 restore_check_timeout disco
 restore_discard_excess_bytes backups_ceph
 retry_interval disco
 rootwrap_config common
+rpc_ack_timeout_base disable
+rpc_ack_timeout_multiplier disable
 rpc_backend disable
-rpc_cast_timeout disable
 rpc_conn_pool_size disable
+rpc_message_ttl disable
 rpc_poll_timeout disable
 rpc_response_timeout disable
+rpc_retry_attempts disable
+rpc_thread_pool_size disable
+rpc_use_acks disable
 rpc_zmq_bind_address disable
 rpc_zmq_bind_port_retries disable
 rpc_zmq_contexts disable
@@ -583,9 +600,6 @@ san_ssh_port san
 san_thin_provision san prophetstor_dpl
 scaleio_server_certificate_path coprhd
 scaleio_verify_server_certificate coprhd
-scality_sofs_config scality
-scality_sofs_mount_point scality
-scality_sofs_volume_dir scality
 scheduler_default_filters scheduler
 scheduler_default_weighers scheduler
 scheduler_driver scheduler
@@ -665,6 +679,7 @@ storwize_svc_vol_rsize storwize
 storwize_svc_vol_warning storwize
 storwize_svc_volpool_name storwize
 strict_ssh_host_key_policy common
+subscribe_on disable
 suppress_requests_ssl_warnings common
 swift_catalog_info backups_swift
 synology_admin_port synology
@@ -690,10 +705,12 @@ tintri_server_password tintri
 tintri_server_username tintri
 trace_flags debug
 transfer_api_class api
+unity_io_ports dell_emc_unity
 unity_storage_pool_names dell_emc_unity
 until_refresh common
 use_chap_auth common
 use_default_quota_class quota
+use_dynamic_connections disable
 use_forwarded_for common
 use_multipath_for_image_xfer images
 use_pub_sub disable
@@ -709,6 +726,7 @@ violin_request_timeout violin
 vmware_api_retry_count vmware
 vmware_ca_file vmware
 vmware_cluster_name vmware
+vmware_connection_pool_size vmware
 vmware_host_ip vmware
 vmware_host_password vmware
 vmware_host_port vmware
@@ -736,11 +754,30 @@ volume_name_prefix api
 volume_name_template api
 volume_number_multiplier api
 volume_service_inithost_offload storage
-volume_tmp_dir storage_ceph
 volume_transfer_key_length api
 volume_transfer_salt_length api
 volume_usage_audit_period storage
 volumes_dir storage
+vsp_async_copy_check_interval hitachi-vsp
+vsp_auth_password hitachi-vsp
+vsp_auth_user hitachi-vsp
+vsp_compute_target_ports hitachi-vsp
+vsp_copy_check_interval hitachi-vsp
+vsp_copy_speed hitachi-vsp
+vsp_default_copy_method hitachi-vsp
+vsp_group_request hitachi-vsp
+vsp_horcm_add_conf hitachi-vsp
+vsp_horcm_numbers hitachi-vsp
+vsp_horcm_pair_target_ports hitachi-vsp
+vsp_horcm_password hitachi-vsp
+vsp_horcm_user hitachi-vsp
+vsp_ldev_range hitachi-vsp
+vsp_pool hitachi-vsp
+vsp_storage_id hitachi-vsp
+vsp_target_ports hitachi-vsp
+vsp_thin_pool hitachi-vsp
+vsp_use_chap_auth hitachi-vsp
+vsp_zoning_request hitachi-vsp
 vzstorage_default_volume_format vzstorage
 vzstorage_mount_options vzstorage
 vzstorage_mount_point_base vzstorage
@@ -793,9 +830,15 @@ zfssa_target_interfaces zfssa-iscsi
 zfssa_target_password zfssa-iscsi
 zfssa_target_portal zfssa-iscsi
 zfssa_target_user zfssa-iscsi
+zmq_failover_connections disable
 zmq_immediate disable
+zmq_linger disable
 zmq_target_expire disable
 zmq_target_update disable
+zmq_tcp_keepalive disable
+zmq_tcp_keepalive_cnt disable
+zmq_tcp_keepalive_idle disable
+zmq_tcp_keepalive_intvl disable
 zoning_mode zoning
 zteAheadReadSize zte
 zteCachePolicy zte
@@ -880,6 +923,11 @@ fc-zone-manager/fc_fabric_names zoning
 fc-zone-manager/fc_san_lookup_service zoning
 fc-zone-manager/zone_driver zoning
 fc-zone-manager/zoning_policy zoning
+healthcheck/backends common
+healthcheck/detailed common
+healthcheck/disable_by_file_path common
+healthcheck/disable_by_file_paths common
+healthcheck/path common
 hyperv/force_volumeutils_v1 hyperv
 key_manager/api_class common
 key_manager/fixed_key common
@@ -919,6 +967,8 @@ keystone_authtoken/memcache_use_advanced_pool disable
 keystone_authtoken/memcached_servers disable
 keystone_authtoken/region_name disable
 keystone_authtoken/revocation_cache_time disable
+keystone_authtoken/service_token_roles disable
+keystone_authtoken/service_token_roles_required disable
 keystone_authtoken/signing_dir disable
 keystone_authtoken/token_cache_time disable
 matchmaker_redis/check_timeout redis
@@ -941,9 +991,11 @@ oslo_messaging_amqp/connection_retry_interval_max disable
 oslo_messaging_amqp/container_name disable
 oslo_messaging_amqp/default_notification_exchange disable
 oslo_messaging_amqp/default_notify_timeout disable
+oslo_messaging_amqp/default_reply_retry disable
 oslo_messaging_amqp/default_reply_timeout disable
 oslo_messaging_amqp/default_rpc_exchange disable
 oslo_messaging_amqp/default_send_timeout disable
+oslo_messaging_amqp/default_sender_link_timeout disable
 oslo_messaging_amqp/group_request_prefix disable
 oslo_messaging_amqp/idle_timeout disable
 oslo_messaging_amqp/link_retry_delay disable
@@ -951,6 +1003,7 @@ oslo_messaging_amqp/multicast_address disable
 oslo_messaging_amqp/notify_address_prefix disable
 oslo_messaging_amqp/notify_server_credit disable
 oslo_messaging_amqp/password disable
+oslo_messaging_amqp/pre_settled disable
 oslo_messaging_amqp/reply_link_credit disable
 oslo_messaging_amqp/rpc_address_prefix disable
 oslo_messaging_amqp/rpc_server_credit disable
@@ -965,6 +1018,16 @@ oslo_messaging_amqp/ssl_key_password disable
 oslo_messaging_amqp/trace disable
 oslo_messaging_amqp/unicast_address disable
 oslo_messaging_amqp/username disable
+oslo_messaging_kafka/conn_pool_min_size disable
+oslo_messaging_kafka/conn_pool_ttl disable
+oslo_messaging_kafka/consumer_group disable
+oslo_messaging_kafka/kafka_consumer_timeout disable
+oslo_messaging_kafka/kafka_default_host disable
+oslo_messaging_kafka/kafka_default_port disable
+oslo_messaging_kafka/kafka_max_fetch_bytes disable
+oslo_messaging_kafka/pool_size disable
+oslo_messaging_kafka/producer_batch_size disable
+oslo_messaging_kafka/producer_batch_timeout disable
 oslo_messaging_notifications/driver disable
 oslo_messaging_notifications/topics disable
 oslo_messaging_notifications/transport_url disable
@@ -976,6 +1039,7 @@ oslo_messaging_rabbit/default_notification_exchange disable
 oslo_messaging_rabbit/default_notification_retry_attempts disable
 oslo_messaging_rabbit/default_rpc_exchange disable
 oslo_messaging_rabbit/default_rpc_retry_attempts disable
+oslo_messaging_rabbit/default_serializer_type disable
 oslo_messaging_rabbit/fake_rabbit disable
 oslo_messaging_rabbit/frame_max disable
 oslo_messaging_rabbit/heartbeat_interval disable
@@ -1024,8 +1088,13 @@ oslo_messaging_rabbit/socket_timeout disable
 oslo_messaging_rabbit/ssl disable
 oslo_messaging_rabbit/ssl_options disable
 oslo_messaging_rabbit/tcp_user_timeout disable
-oslo_messaging_zmq/rpc_cast_timeout disable
+oslo_messaging_zmq/rpc_ack_timeout_base disable
+oslo_messaging_zmq/rpc_ack_timeout_multiplier disable
+oslo_messaging_zmq/rpc_message_ttl disable
 oslo_messaging_zmq/rpc_poll_timeout disable
+oslo_messaging_zmq/rpc_retry_attempts disable
+oslo_messaging_zmq/rpc_thread_pool_size disable
+oslo_messaging_zmq/rpc_use_acks disable
 oslo_messaging_zmq/rpc_zmq_bind_address disable
 oslo_messaging_zmq/rpc_zmq_bind_port_retries disable
 oslo_messaging_zmq/rpc_zmq_contexts disable
@@ -1036,11 +1105,19 @@ oslo_messaging_zmq/rpc_zmq_max_port disable
 oslo_messaging_zmq/rpc_zmq_min_port disable
 oslo_messaging_zmq/rpc_zmq_serialization disable
 oslo_messaging_zmq/rpc_zmq_topic_backlog disable
+oslo_messaging_zmq/subscribe_on disable
+oslo_messaging_zmq/use_dynamic_connections disable
 oslo_messaging_zmq/use_pub_sub disable
 oslo_messaging_zmq/use_router_proxy disable
+oslo_messaging_zmq/zmq_failover_connections disable
 oslo_messaging_zmq/zmq_immediate disable
+oslo_messaging_zmq/zmq_linger disable
 oslo_messaging_zmq/zmq_target_expire disable
 oslo_messaging_zmq/zmq_target_update disable
+oslo_messaging_zmq/zmq_tcp_keepalive disable
+oslo_messaging_zmq/zmq_tcp_keepalive_cnt disable
+oslo_messaging_zmq/zmq_tcp_keepalive_idle disable
+oslo_messaging_zmq/zmq_tcp_keepalive_intvl disable
 oslo_middleware/enable_proxy_headers_parsing api
 oslo_middleware/max_request_body_size api
 oslo_middleware/secure_proxy_ssl_header api
@@ -1054,5 +1131,10 @@ privsep_osbrick/helper_command osbrick
 privsep_osbrick/user osbrick
 profiler/connection_string profiler
 profiler/enabled profiler
+profiler/es_doc_type profiler
+profiler/es_scroll_size profiler
+profiler/es_scroll_time profiler
 profiler/hmac_keys profiler
+profiler/sentinel_service_name profiler
+profiler/socket_timeout profiler
 profiler/trace_sqlalchemy profiler

tools/autogenerate-config-flagmappings/cinder.headers

@@ -31,6 +31,7 @@ hds-hus HDS HUS iSCSI driver
 hgst HGST volume driver
 hitachi-hbsd Hitachi storage volume driver
 hitachi-hnas Hitachi HNAS iSCSI and NFS driver
+hitachi-vsp HORCM interface module for Hitachi VSP driver
 hpe3par HPE 3PAR Fibre Channel and iSCSI drivers
 hpelefthand HPE LeftHand/StoreVirtual driver
 hpmsa HP MSA volume driver
@@ -39,6 +40,7 @@ huawei Huawei storage driver
 hyperv HyperV volume driver
 ibmnas IBM SONAS and Storwise V7000 volume driver
 images images
+infinidat INFINIDAT InfiniBox volume driver
 infortrend Infortrend volume driver
 kaminario Kaminario volume driver
 lenovo Lenovo volume driver
@@ -60,6 +62,7 @@ openvstorage Open vStorage driver
 osbrick os-brick
 prophetstor_dpl ProphetStor Fibre Channel and iSCSi drivers
 pure Pure Storage driver
+qnap QNAP storage volume driver
 quobyte Quobyte USP volume driver
 san SAN
 san-solaris Solaris SAN