openstack/openstack-manuals
Code Issues Proposed changes

Merge "Add Documentation for CISCOFCZoneDriver"

Browse Source
This commit is contained in:
Jenkins 2014-12-04 21:09:27 +00:00 committed by Gerrit Code Review
commit 2927bee41c
8 changed files with 128 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/common/tables/cinder-zoning.xml
View File

@ -28,6 +28,14 @@
<td>fc_fabric_names = None</td>
<td>(StrOpt) 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</td>
</tr>
<tr>
<td>fc_san_lookup_service = cinder.zonemanager.drivers.brocade.brcd_fc_san_lookup_service.BrcdFCSanLookupService</td>
<td>(StrOpt) FC San Lookup Service</td>
</tr>
<tr>
<td>zone_driver = cinder.zonemanager.drivers.brocade.brcd_fc_zone_driver.BrcdFCZoneDriver</td>
<td>(StrOpt) FC Zone Driver responsible for zone management</td>
</tr>
<tr>
<td>zoning_policy = initiator-target</td>
<td>(StrOpt) Zoning policy configured by user</td>

35
doc/common/tables/cinder-zoning_fabric.xml
View File

@ -49,41 +49,6 @@
<td>zoning_policy = initiator-target</td>
<td>(StrOpt) overridden zoning policy</td>
</tr>
<tr>
<th colspan="2">[CISCO_FABRIC_EXAMPLE]</th>
</tr>
<tr>
<td>cisco_fc_fabric_address = </td>
<td>(StrOpt) Management IP of fabric</td>
</tr>
<tr>
<td>cisco_fc_fabric_password = </td>
<td>(StrOpt) Password for user</td>
</tr>
<tr>
<td>cisco_fc_fabric_port = 22</td>
<td>(IntOpt) Connecting port</td>
</tr>
<tr>
<td>cisco_fc_fabric_user = </td>
<td>(StrOpt) Fabric user ID</td>
</tr>
<tr>
<td>cisco_zone_activate = True</td>
<td>(BoolOpt) overridden zoning activation state</td>
</tr>
<tr>
<td>cisco_zone_name_prefix = None</td>
<td>(StrOpt) overridden zone name prefix</td>
</tr>
<tr>
<td>cisco_zoning_policy = initiator-target</td>
<td>(StrOpt) overridden zoning policy</td>
</tr>
<tr>
<td>cisco_zoning_vsan = None</td>
<td>(StrOpt) VSAN of the Fabric</td>
</tr>
</tbody>
</table>
</para>

54
doc/common/tables/cinder-zoning_fabric_cisco.xml Normal file
View File

@ -0,0 +1,54 @@
<?xml version='1.0' encoding='UTF-8'?>
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<!-- Warning: Do not edit this file. It is automatically
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_cinder_zoning_fabric_cisco">
<caption>Description of cisco zoning fabrics configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
<tr>
<th>Configuration option = Default value</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<th colspan="2">[CISCO_FABRIC_EXAMPLE]</th>
</tr>
<tr>
<td>cisco_fc_fabric_address = </td>
<td>(StrOpt) Management IP of fabric</td>
</tr>
<tr>
<td>cisco_fc_fabric_password = </td>
<td>(StrOpt) Password for user</td>
</tr>
<tr>
<td>cisco_fc_fabric_port = 22</td>
<td>(IntOpt) Connecting port</td>
</tr>
<tr>
<td>cisco_fc_fabric_user = </td>
<td>(StrOpt) Fabric user ID</td>
</tr>
<tr>
<td>cisco_zone_activate = True</td>
<td>(BoolOpt) overridden zoning activation state</td>
</tr>
<tr>
<td>cisco_zone_name_prefix = None</td>
<td>(StrOpt) overridden zone name prefix</td>
</tr>
<tr>
<td>cisco_zoning_policy = initiator-target</td>
<td>(StrOpt) overridden zoning policy</td>
</tr>
<tr>
<td>cisco_zoning_vsan = None</td>
<td>(StrOpt) VSAN of the Fabric</td>
</tr>
</tbody>
</table>
</para>

12
doc/common/tables/cinder-zoning_manager.xml
View File

@ -21,18 +21,6 @@
<td>brcd_sb_connector = cinder.zonemanager.drivers.brocade.brcd_fc_zone_client_cli.BrcdFCZoneClientCLI</td>
<td>(StrOpt) Southbound connector for zoning operation</td>
</tr>
<tr>
<td>cisco_sb_connector = cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli.CiscoFCZoneClientCLI</td>
<td>(StrOpt) Southbound connector for zoning operation</td>
</tr>
<tr>
<td>fc_san_lookup_service = cinder.zonemanager.drivers.brocade.brcd_fc_san_lookup_service.BrcdFCSanLookupService</td>
<td>(StrOpt) FC San Lookup Service</td>
</tr>
<tr>
<td>zone_driver = cinder.zonemanager.drivers.brocade.brcd_fc_zone_driver.BrcdFCZoneDriver</td>
<td>(StrOpt) FC Zone Driver responsible for zone management</td>
</tr>
</tbody>
</table>
</para>

26
doc/common/tables/cinder-zoning_manager_cisco.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version='1.0' encoding='UTF-8'?>
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<!-- Warning: Do not edit this file. It is automatically
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_cinder_zoning_manager_cisco">
<caption>Description of cisco zoning manager configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
<tr>
<th>Configuration option = Default value</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<th colspan="2">[fc-zone-manager]</th>
</tr>
<tr>
<td>cisco_sb_connector = cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli.CiscoFCZoneClientCLI</td>
<td>(StrOpt) Southbound connector for zoning operation</td>
</tr>
</tbody>
</table>
</para>

27
doc/config-reference/block-storage/section_fc-zoning.xml
View File

@ -69,4 +69,31 @@
switches, see the Brocade Fabric OS user documentation.</para>
</section>
</section>
<section xml:id="cisco-fc-zone-driver">
<title>Cisco Fibre Channel Zone Driver</title>
<para>Cisco Fibre Channel Zone Driver performs zoning operations
via SSH. Configure Cisco Zone Driver and lookup service by
specifying the following parameters:</para>
<xi:include href="../../common/tables/cinder-zoning_manager_cisco.xml"/>
<para>Configure SAN fabric parameters in the form of fabric
groups as described in the example below:</para>
<xi:include href="../../common/tables/cinder-zoning_fabric_cisco.xml"/>
<note>
<para>Define a fabric group for each fabric using the fabric names
used in <option>fc_fabric_names</option> configuration option
as group name.
</para>
<para>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 <option>fc_fabric_names</option> parameter.
</para>
</note>
<section xml:id="cisco-zone-driver-sys-reqs">
<title>System requirements</title>
<para>Cisco MDS 9000 Family Switches.</para>
<para>Cisco MDS NX-OS Release 6.2(9) or later.</para>
<para>For information about how to manage Cisco Fibre Channel
switches, see the Cisco MDS 9000 user documentation.</para>
</section>
</section>
</section>

22
tools/autogenerate-config-flagmappings/cinder.flagmappings
View File

@ -480,14 +480,14 @@ 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
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
database/backend database
database/connection database
database/connection_debug database
@ -510,10 +510,10 @@ database/sqlite_synchronous database
database/use_db_reconnect database
database/use_tpool database
fc-zone-manager/brcd_sb_connector zoning_manager
fc-zone-manager/cisco_sb_connector zoning_manager
fc-zone-manager/cisco_sb_connector zoning_manager_cisco
fc-zone-manager/fc_fabric_names zoning
fc-zone-manager/fc_san_lookup_service zoning_manager
fc-zone-manager/zone_driver zoning_manager
fc-zone-manager/fc_san_lookup_service zoning
fc-zone-manager/zone_driver zoning
fc-zone-manager/zoning_policy zoning
keymgr/api_class keymgr
keymgr/encryption_api_url keymgr

2
tools/autogenerate-config-flagmappings/cinder.headers
View File

@ -51,3 +51,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