[config-ref] reorganize FC Zone Manager section

For Block Storage service.

backport: mitaka

Change-Id: Id8424e25081f32fcd6d5312bed2a469da27a8eff
Closes-Bug: #1453243

doc/config-reference/source/block-storage/fc-zoning.rst

@@ -43,10 +43,14 @@ Brocade Fibre Channel Zone Driver
 Brocade Fibre Channel Zone Driver performs zoning operations
 through HTTP, HTTPS, or SSH.
 
+Set the following options in the ``cinder.conf`` configuration file.
+
+.. include:: ../tables/cinder-zoning_manager_brcd.rst
+
 Configure SAN fabric parameters in the form of fabric groups as
 described in the example below:
 
-.. include:: ../tables/cinder-zoning_fabric.rst
+.. include:: ../tables/cinder-zoning_fabric_brcd.rst
 
 .. note::
 

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

@@ -22,10 +22,6 @@
      - (String) FC Zoning mode configured
    * - **[fc-zone-manager]**
      -
-   * - ``brcd_sb_connector`` = ``HTTP``
-     - (String) South bound connector for zoning operation
-   * - ``cisco_sb_connector`` = ``cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli.CiscoFCZoneClientCLI``
-     - (String) Southbound connector for zoning operation
    * - ``fc_fabric_names`` = ``None``
      - (String) Comma separated list of Fibre Channel fabric names. This list of names is used to retrieve other SAN credentials for connecting to each SAN fabric
    * - ``fc_san_lookup_service`` = ``cinder.zonemanager.drivers.brocade.brcd_fc_san_lookup_service.BrcdFCSanLookupService``

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

@@ -8,9 +8,9 @@
     autogenerate-config-doc tool from the openstack-doc-tools repository, or
     ask for help on the documentation mailing list, IRC channel or meeting.
 
-.. _cinder-zoning_fabric:
+.. _cinder-zoning_fabric_brcd:
 
-.. list-table:: Description of zoning fabrics configuration options
+.. list-table:: Description of brocade zoning fabrics configuration options
    :header-rows: 1
    :class: config-ref-table
 
@@ -40,21 +40,3 @@
      - (String) Overridden zone name prefix.
    * - ``zoning_policy`` = ``initiator-target``
      - (String) Overridden zoning policy.
-   * - **[CISCO_FABRIC_EXAMPLE]**
-     -
-   * - ``cisco_fc_fabric_address`` =
-     - (String) Management IP of fabric
-   * - ``cisco_fc_fabric_password`` =
-     - (String) Password for user
-   * - ``cisco_fc_fabric_port`` = ``22``
-     - (Unknown) Connecting port
-   * - ``cisco_fc_fabric_user`` =
-     - (String) Fabric user ID
-   * - ``cisco_zone_activate`` = ``True``
-     - (Boolean) overridden zoning activation state
-   * - ``cisco_zone_name_prefix`` = ``None``
-     - (String) overridden zone name prefix
-   * - ``cisco_zoning_policy`` = ``initiator-target``
-     - (String) overridden zoning policy
-   * - ``cisco_zoning_vsan`` = ``None``
-     - (String) VSAN of the Fabric

doc/config-reference/source/tables/cinder-zoning_manager_brcd.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-zoning_manager_brcd:
+
+.. list-table:: Description of brocade zoning manager configuration options
+   :header-rows: 1
+   :class: config-ref-table
+
+   * - Configuration option = Default value
+     - Description
+   * - **[DEFAULT]**
+     -
+   * - ``zoning_mode`` = ``None``
+     - (String) FC Zoning mode configured
+   * - **[fc-zone-manager]**
+     -
+   * - ``brcd_sb_connector`` = ``HTTP``
+     - (String) South bound connector for zoning operation

tools/autogenerate-config-flagmappings/cinder.flagmappings

@@ -672,25 +672,25 @@ zfssa_target_portal zfssa-iscsi
 zfssa_target_user zfssa-iscsi
 zmq_target_expire zeromq
 zoning_mode zoning
-BRCD_FABRIC_EXAMPLE/fc_fabric_address zoning_fabric
-BRCD_FABRIC_EXAMPLE/fc_fabric_password zoning_fabric
-BRCD_FABRIC_EXAMPLE/fc_fabric_port zoning_fabric
-BRCD_FABRIC_EXAMPLE/fc_fabric_ssh_cert_path zoning_fabric
-BRCD_FABRIC_EXAMPLE/fc_fabric_user zoning_fabric
-BRCD_FABRIC_EXAMPLE/fc_southbound_protocol zoning_fabric
-BRCD_FABRIC_EXAMPLE/fc_virtual_fabric_id zoning_fabric
-BRCD_FABRIC_EXAMPLE/principal_switch_wwn zoning_fabric
-BRCD_FABRIC_EXAMPLE/zone_activate zoning_fabric
-BRCD_FABRIC_EXAMPLE/zone_name_prefix zoning_fabric
-BRCD_FABRIC_EXAMPLE/zoning_policy zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_address zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_password zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_port zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_user zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_zone_activate zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_zone_name_prefix zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_zoning_policy zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_zoning_vsan zoning_fabric
+BRCD_FABRIC_EXAMPLE/fc_fabric_address zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/fc_fabric_password zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/fc_fabric_port zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/fc_fabric_ssh_cert_path zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/fc_fabric_user zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/fc_southbound_protocol zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/fc_virtual_fabric_id zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/principal_switch_wwn zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/zone_activate zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/zone_name_prefix zoning_fabric_brcd
+BRCD_FABRIC_EXAMPLE/zoning_policy zoning_fabric_brcd
+CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_address zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_password zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_port zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_user zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_zone_activate zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_zone_name_prefix zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_zoning_policy zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_zoning_vsan zoning_fabric_cisco
 coordination/backend_url coordination
 coordination/heartbeat coordination
 coordination/initial_reconnect_backoff coordination
@@ -728,8 +728,8 @@ database/sqlite_db database
 database/sqlite_synchronous database
 database/use_db_reconnect database
 database/use_tpool database
-fc-zone-manager/brcd_sb_connector zoning
-fc-zone-manager/cisco_sb_connector zoning
+fc-zone-manager/brcd_sb_connector zoning_manage_brcd
+fc-zone-manager/cisco_sb_connector zoning_manager_cisco
 fc-zone-manager/fc_fabric_names zoning
 fc-zone-manager/fc_san_lookup_service zoning
 fc-zone-manager/zone_driver zoning

tools/autogenerate-config-flagmappings/cinder.headers

@@ -80,7 +80,8 @@ zfssa-iscsi ZFS Storage Appliance iSCSI driver
 zfssa-nfs ZFS Storage Appliance NFS driver
 zones zones
 zoning zoning
-zoning_fabric zoning fabrics
 zoning_manager zoning manager
+zoning_fabric_brcd brocade zoning fabrics
 zoning_fabric_cisco cisco zoning fabrics
+zoning_manager_brcd brocade zoning manager
 zoning_manager_cisco cisco zoning manager