[config-ref] update HNAS and HBSD Block Storage driver options

Fix improper driver category.

backport: newton

Change-Id: I66e2c55e2103cf1f7cf12f364c32328e94bb63bf
Closes-Bug: #1642242

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

@@ -1,24 +0,0 @@
-..
-    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-hds-hnas:
-
-.. list-table:: Description of HDS HNAS iSCSI and NFS driver configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``hds_hnas_iscsi_config_file`` = ``/opt/hds/hnas/cinder_iscsi_conf.xml``
-     - (String) DEPRECATED: Legacy configuration file for HNAS iSCSI Cinder plugin. This is not needed if you fill all configuration on cinder.conf
-   * - ``hds_hnas_nfs_config_file`` = ``/opt/hds/hnas/cinder_nfs_conf.xml``
-     - (String) DEPRECATED: Legacy configuration file for HNAS NFS Cinder plugin. This is not needed if you fill all configuration on cinder.conf

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

@@ -62,43 +62,3 @@
      - (String) Name of an array unit
    * - ``hitachi_zoning_request`` = ``False``
      - (Boolean) Request for FC Zone creating HostGroup
-   * - ``hnas_chap_enabled`` = ``True``
-     - (Boolean) Whether the chap authentication is enabled in the iSCSI target or not.
-   * - ``hnas_cluster_admin_ip0`` = ``None``
-     - (String) The IP of the HNAS cluster admin. Required only for HNAS multi-cluster setups.
-   * - ``hnas_mgmt_ip0`` = ``None``
-     - (IP) Management IP address of HNAS. This can be any IP in the admin address on HNAS or the SMU IP.
-   * - ``hnas_password`` = ``None``
-     - (String) HNAS password.
-   * - ``hnas_ssc_cmd`` = ``ssc``
-     - (String) Command to communicate to HNAS.
-   * - ``hnas_ssh_port`` = ``22``
-     - (Port number) Port to be used for SSH authentication.
-   * - ``hnas_ssh_private_key`` = ``None``
-     - (String) Path to the SSH private key used to authenticate in HNAS SMU.
-   * - ``hnas_svc0_hdp`` = ``None``
-     - (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_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_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_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_username`` = ``None``
-     - (String) HNAS username.

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

@@ -0,0 +1,64 @@
+..
+    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-hnas:
+
+.. list-table:: Description of Hitachi HNAS iSCSI and NFS driver configuration options
+   :header-rows: 1
+   :class: config-ref-table
+
+   * - Configuration option = Default value
+     - Description
+   * - **[DEFAULT]**
+     -
+   * - ``hds_hnas_iscsi_config_file`` = ``/opt/hds/hnas/cinder_iscsi_conf.xml``
+     - (String) DEPRECATED: Legacy configuration file for HNAS iSCSI Cinder plugin. This is not needed if you fill all configuration on cinder.conf
+   * - ``hds_hnas_nfs_config_file`` = ``/opt/hds/hnas/cinder_nfs_conf.xml``
+     - (String) DEPRECATED: Legacy configuration file for HNAS NFS Cinder plugin. This is not needed if you fill all configuration on cinder.conf
+   * - ``hnas_chap_enabled`` = ``True``
+     - (Boolean) Whether the chap authentication is enabled in the iSCSI target or not.
+   * - ``hnas_cluster_admin_ip0`` = ``None``
+     - (String) The IP of the HNAS cluster admin. Required only for HNAS multi-cluster setups.
+   * - ``hnas_mgmt_ip0`` = ``None``
+     - (IP) Management IP address of HNAS. This can be any IP in the admin address on HNAS or the SMU IP.
+   * - ``hnas_password`` = ``None``
+     - (String) HNAS password.
+   * - ``hnas_ssc_cmd`` = ``ssc``
+     - (String) Command to communicate to HNAS.
+   * - ``hnas_ssh_port`` = ``22``
+     - (Port number) Port to be used for SSH authentication.
+   * - ``hnas_ssh_private_key`` = ``None``
+     - (String) Path to the SSH private key used to authenticate in HNAS SMU.
+   * - ``hnas_svc0_hdp`` = ``None``
+     - (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_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_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_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_username`` = ``None``
+     - (String) HNAS username.

tools/autogenerate-config-flagmappings/cinder.flagmappings

@@ -225,8 +225,8 @@ gpfs_mount_point_base storage_gpfs
 gpfs_sparse_volumes storage_gpfs
 gpfs_storage_pool storage_gpfs
 group_api_class common
-hds_hnas_iscsi_config_file hds-hnas
+hds_hnas_iscsi_config_file hitachi-hnas
-hds_hnas_nfs_config_file hds-hnas
+hds_hnas_nfs_config_file hitachi-hnas
 hgst_net hgst
 hgst_redundancy hgst
 hgst_space_group hgst
@@ -255,26 +255,26 @@ hitachi_target_ports hitachi-hbsd
 hitachi_thin_pool_id hitachi-hbsd
 hitachi_unit_name hitachi-hbsd
 hitachi_zoning_request hitachi-hbsd
-hnas_chap_enabled hitachi-hbsd
+hnas_chap_enabled hitachi-hnas
-hnas_cluster_admin_ip0 hitachi-hbsd
+hnas_cluster_admin_ip0 hitachi-hnas
-hnas_mgmt_ip0 hitachi-hbsd
+hnas_mgmt_ip0 hitachi-hnas
-hnas_password hitachi-hbsd
+hnas_password hitachi-hnas
-hnas_ssc_cmd hitachi-hbsd
+hnas_ssc_cmd hitachi-hnas
-hnas_ssh_port hitachi-hbsd
+hnas_ssh_port hitachi-hnas
-hnas_ssh_private_key hitachi-hbsd
+hnas_ssh_private_key hitachi-hnas
-hnas_svc0_hdp hitachi-hbsd
+hnas_svc0_hdp hitachi-hnas
-hnas_svc0_iscsi_ip hitachi-hbsd
+hnas_svc0_iscsi_ip hitachi-hnas
-hnas_svc0_volume_type hitachi-hbsd
+hnas_svc0_volume_type hitachi-hnas
-hnas_svc1_hdp hitachi-hbsd
+hnas_svc1_hdp hitachi-hnas
-hnas_svc1_iscsi_ip hitachi-hbsd
+hnas_svc1_iscsi_ip hitachi-hnas
-hnas_svc1_volume_type hitachi-hbsd
+hnas_svc1_volume_type hitachi-hnas
-hnas_svc2_hdp hitachi-hbsd
+hnas_svc2_hdp hitachi-hnas
-hnas_svc2_iscsi_ip hitachi-hbsd
+hnas_svc2_iscsi_ip hitachi-hnas
-hnas_svc2_volume_type hitachi-hbsd
+hnas_svc2_volume_type hitachi-hnas
-hnas_svc3_hdp hitachi-hbsd
+hnas_svc3_hdp hitachi-hnas
-hnas_svc3_iscsi_ip hitachi-hbsd
+hnas_svc3_iscsi_ip hitachi-hnas
-hnas_svc3_volume_type hitachi-hbsd
+hnas_svc3_volume_type hitachi-hnas
-hnas_username hitachi-hbsd
+hnas_username hitachi-hnas
 host common
 hpe3par_api_url hpe3par
 hpe3par_cpg hpe3par

tools/autogenerate-config-flagmappings/cinder.headers

@@ -26,10 +26,10 @@ falconstor Falconstor volume driver
 flashsystem IBM FlashSystem volume driver
 fujitsu_eternus_dx Fujitsu ETERNUS DX volume driver
 fusionio Fusion-io driver
-hds-hnas HDS HNAS iSCSI and NFS driver
 hds-hus HDS HUS iSCSI driver
 hgst HGST volume driver
 hitachi-hbsd Hitachi storage volume driver
+hitachi-hnas Hitachi HNAS iSCSI and NFS driver
 hpe3par HPE 3PAR Fibre Channel and iSCSI drivers
 hpelefthand HPE LeftHand/StoreVirtual driver
 hpmsa HP MSA volume driver