From c44f9a3282e3a3da3701e14e01bdc7a1a1b4faab Mon Sep 17 00:00:00 2001 From: venkatamahesh Date: Fri, 3 Jun 2016 11:48:14 +0000 Subject: [PATCH] Revert "[config-ref] Remove cisco FC Zone manager driver" The Cisco FCZM driver was removed for lack of CI during the Mitaka development cycle. Prior to the final Mitaka release this was rectified and the FCZM driver was added back in to the release. This cisco FCZM driver doc should be added again This reverts commit c2ed9b27819043c0b7e109bbb355cf3b36ed7c05. backport: mitaka Change-Id: Ibe0d72d1070fcc49194c488806c71a0423df790b --- .../source/block-storage/fc-zoning.rst | 42 +++++++++++++++++++ .../tables/cinder-zoning_fabric_cisco.rst | 36 ++++++++++++++++ .../tables/cinder-zoning_manager_cisco.rst | 22 ++++++++++ .../cinder.headers | 2 + 4 files changed, 102 insertions(+) create mode 100644 doc/config-reference/source/tables/cinder-zoning_fabric_cisco.rst create mode 100644 doc/config-reference/source/tables/cinder-zoning_manager_cisco.rst diff --git a/doc/config-reference/source/block-storage/fc-zoning.rst b/doc/config-reference/source/block-storage/fc-zoning.rst index aca9a3d22a..34b53b7762 100644 --- a/doc/config-reference/source/block-storage/fc-zoning.rst +++ b/doc/config-reference/source/block-storage/fc-zoning.rst @@ -75,3 +75,45 @@ sessions. For information about how to manage Brocade Fibre Channel switches, see the Brocade Fabric OS user documentation. +Cisco Fibre Channel Zone Driver +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Cisco Fibre Channel Zone Driver automates the zoning operations through +SSH. Configure Cisco Zone Driver, Cisco Southbound connector, FC SAN +lookup service and Fabric name. + +Set the following options in the ``cinder.conf`` configuration file. + +.. code-block:: ini + + [fc-zone-manager] + zone_driver = cinder.zonemanager.drivers.cisco.cisco_fc_zone_driver.CiscoFCZoneDriver + fc_san_lookup_service = cinder.zonemanager.drivers.cisco.cisco_fc_san_lookup_service.CiscoFCSanLookupService + fc_fabric_names = CISCO_FABRIC_EXAMPLE + cisco_sb_connector = cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli.CiscoFCZoneClientCLI + +.. include:: ../tables/cinder-zoning_manager_cisco.rst + +Configure SAN fabric parameters in the form of fabric groups as +described in the example below: + +.. include:: ../tables/cinder-zoning_fabric_cisco.rst + +.. note:: + + Define a fabric group for each fabric using the fabric names used in + ``fc_fabric_names`` configuration option as group name. + + The Cisco Fibre Channel Zone Driver supports basic and enhanced + zoning modes.The zoning VSAN must exist with an active zone set name + which is same as the ``fc_fabric_names`` option. + +System requirements +------------------- + +Cisco MDS 9000 Family Switches. + +Cisco MDS NX-OS Release 6.2(9) or later. + +For information about how to manage Cisco Fibre Channel switches, see +the Cisco MDS 9000 user documentation. diff --git a/doc/config-reference/source/tables/cinder-zoning_fabric_cisco.rst b/doc/config-reference/source/tables/cinder-zoning_fabric_cisco.rst new file mode 100644 index 0000000000..3c78d736ae --- /dev/null +++ b/doc/config-reference/source/tables/cinder-zoning_fabric_cisco.rst @@ -0,0 +1,36 @@ +.. + 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_fabric_cisco: + +.. list-table:: Description of cisco zoning fabrics configuration options + :header-rows: 1 + :class: config-ref-table + + * - Configuration option = Default value + - Description + * - **[CISCO_FABRIC_EXAMPLE]** + - + * - ``cisco_fc_fabric_address`` = + - (StrOpt) Management IP of fabric + * - ``cisco_fc_fabric_password`` = + - (StrOpt) Password for user + * - ``cisco_fc_fabric_port`` = ``22`` + - (PortOpt) Connecting port + * - ``cisco_fc_fabric_user`` = + - (StrOpt) Fabric user ID + * - ``cisco_zone_activate`` = ``True`` + - (BoolOpt) overridden zoning activation state + * - ``cisco_zone_name_prefix`` = ``None`` + - (StrOpt) overridden zone name prefix + * - ``cisco_zoning_policy`` = ``initiator-target`` + - (StrOpt) overridden zoning policy + * - ``cisco_zoning_vsan`` = ``None`` + - (StrOpt) VSAN of the Fabric diff --git a/doc/config-reference/source/tables/cinder-zoning_manager_cisco.rst b/doc/config-reference/source/tables/cinder-zoning_manager_cisco.rst new file mode 100644 index 0000000000..93084f16ca --- /dev/null +++ b/doc/config-reference/source/tables/cinder-zoning_manager_cisco.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-zoning_manager_cisco: + +.. list-table:: Description of cisco zoning manager configuration options + :header-rows: 1 + :class: config-ref-table + + * - Configuration option = Default value + - Description + * - **[fc-zone-manager]** + - + * - ``cisco_sb_connector`` = ``cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli.CiscoFCZoneClientCLI`` + - (StrOpt) Southbound connector for zoning operation diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers index 60dc9550b3..16ecb79c0b 100644 --- a/tools/autogenerate-config-flagmappings/cinder.headers +++ b/tools/autogenerate-config-flagmappings/cinder.headers @@ -80,3 +80,5 @@ zones zones zoning zoning zoning_fabric zoning fabrics zoning_manager zoning manager +zoning_fabric_cisco cisco zoning fabrics +zoning_manager_cisco cisco zoning manager