From 17254eb9d04099384649bd2d92aab06d9903d165 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Fri, 7 Mar 2014 07:24:59 +0100 Subject: [PATCH] Update cinder config ref tables Get the latest help strings for NetApp. Split the FC zoning options in three tables. Change-Id: I6426a43d5b8e388eb2b877463fea50c5823d1b10 --- doc/common/tables/cinder-api.xml | 14 ++++- doc/common/tables/cinder-auth.xml | 2 +- doc/common/tables/cinder-backups.xml | 2 +- doc/common/tables/cinder-backups_ceph.xml | 2 +- doc/common/tables/cinder-backups_swift.xml | 2 +- doc/common/tables/cinder-backups_tsm.xml | 2 +- doc/common/tables/cinder-block-device.xml | 2 +- doc/common/tables/cinder-common.xml | 30 +++++----- doc/common/tables/cinder-compute.xml | 2 +- doc/common/tables/cinder-connection.xml | 2 +- doc/common/tables/cinder-coraid.xml | 2 +- doc/common/tables/cinder-database.xml | 2 +- doc/common/tables/cinder-emc.xml | 14 ++++- doc/common/tables/cinder-eqlx.xml | 2 +- doc/common/tables/cinder-hds.xml | 2 +- doc/common/tables/cinder-hp3par.xml | 2 +- doc/common/tables/cinder-hplefthand.xml | 2 +- doc/common/tables/cinder-hpmsa.xml | 2 +- doc/common/tables/cinder-huawei.xml | 2 +- doc/common/tables/cinder-images.xml | 2 +- doc/common/tables/cinder-keymgr.xml | 2 +- doc/common/tables/cinder-lvm.xml | 2 +- doc/common/tables/cinder-nas.xml | 2 +- .../tables/cinder-netapp_7mode_iscsi.xml | 12 ++-- doc/common/tables/cinder-netapp_7mode_nfs.xml | 12 ++-- .../tables/cinder-netapp_cdot_iscsi.xml | 12 ++-- doc/common/tables/cinder-netapp_cdot_nfs.xml | 12 ++-- .../tables/cinder-netapp_eseries_iscsi.xml | 2 +- doc/common/tables/cinder-nexenta_iscsi.xml | 2 +- doc/common/tables/cinder-nexenta_nfs.xml | 2 +- doc/common/tables/cinder-quota.xml | 2 +- doc/common/tables/cinder-rpc.xml | 23 +++++++- doc/common/tables/cinder-san-solaris.xml | 2 +- doc/common/tables/cinder-san.xml | 2 +- doc/common/tables/cinder-scality.xml | 2 +- doc/common/tables/cinder-scheduler.xml | 2 +- doc/common/tables/cinder-solidfire.xml | 2 +- doc/common/tables/cinder-ssl.xml | 2 +- doc/common/tables/cinder-storage.xml | 2 +- doc/common/tables/cinder-storage_ceph.xml | 2 +- .../tables/cinder-storage_glusterfs.xml | 2 +- doc/common/tables/cinder-storage_gpfs.xml | 2 +- doc/common/tables/cinder-storage_nfs.xml | 2 +- doc/common/tables/cinder-storage_xen.xml | 2 +- doc/common/tables/cinder-storwize.xml | 2 +- doc/common/tables/cinder-vmware.xml | 10 +++- doc/common/tables/cinder-windows.xml | 2 +- doc/common/tables/cinder-xiv.xml | 2 +- doc/common/tables/cinder-zadara.xml | 2 +- doc/common/tables/cinder-zones.xml | 2 +- doc/common/tables/cinder-zoning.xml | 49 +---------------- doc/common/tables/cinder-zoning_fabric.xml | 55 +++++++++++++++++++ doc/common/tables/cinder-zoning_manager.xml | 35 ++++++++++++ .../cinder.flagmappings | 49 +++++++++++------ 54 files changed, 260 insertions(+), 149 deletions(-) create mode 100644 doc/common/tables/cinder-zoning_fabric.xml create mode 100644 doc/common/tables/cinder-zoning_manager.xml diff --git a/doc/common/tables/cinder-api.xml b/doc/common/tables/cinder-api.xml index d83f7e5e7d..a6c33fe3d9 100644 --- a/doc/common/tables/cinder-api.xml +++ b/doc/common/tables/cinder-api.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
@@ -38,6 +38,10 @@ + + + + @@ -86,6 +90,14 @@ + + + + + + + +
Description of configuration options for api
enable_v2_api = True (BoolOpt) Deploy v2 of the Cinder API.
extra_capabilities = {}(StrOpt) User defined capabilities, a JSON formatted string specifying key/value pairs.
max_header_line = 16384 (IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs).volume_name_template = volume-%s (StrOpt) Template string to be used to generate volume names
volume_transfer_key_length = 16(IntOpt) The number of characters in the autogenerated auth key.
volume_transfer_salt_length = 8(IntOpt) The number of characters in the salt.
diff --git a/doc/common/tables/cinder-auth.xml b/doc/common/tables/cinder-auth.xml index 91d9909818..899fd8dd78 100644 --- a/doc/common/tables/cinder-auth.xml +++ b/doc/common/tables/cinder-auth.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/cinder-backups.xml b/doc/common/tables/cinder-backups.xml index 7f75882594..62f00d73c3 100644 --- a/doc/common/tables/cinder-backups.xml +++ b/doc/common/tables/cinder-backups.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for auth
+
diff --git a/doc/common/tables/cinder-backups_ceph.xml b/doc/common/tables/cinder-backups_ceph.xml index 9d2ac630fc..105cd2c197 100644 --- a/doc/common/tables/cinder-backups_ceph.xml +++ b/doc/common/tables/cinder-backups_ceph.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for backups
+
diff --git a/doc/common/tables/cinder-backups_swift.xml b/doc/common/tables/cinder-backups_swift.xml index 0375192995..f34187bace 100644 --- a/doc/common/tables/cinder-backups_swift.xml +++ b/doc/common/tables/cinder-backups_swift.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for backups_ceph
+
diff --git a/doc/common/tables/cinder-backups_tsm.xml b/doc/common/tables/cinder-backups_tsm.xml index 49db415276..db47b26503 100644 --- a/doc/common/tables/cinder-backups_tsm.xml +++ b/doc/common/tables/cinder-backups_tsm.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for backups_swift
+
diff --git a/doc/common/tables/cinder-block-device.xml b/doc/common/tables/cinder-block-device.xml index 4fa9962eef..21393b9d02 100644 --- a/doc/common/tables/cinder-block-device.xml +++ b/doc/common/tables/cinder-block-device.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for backups_tsm
+
diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml index 64a21d9c28..be881b2139 100644 --- a/doc/common/tables/cinder-common.xml +++ b/doc/common/tables/cinder-common.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for block-device
+
@@ -31,8 +31,8 @@ - - + + @@ -56,7 +56,7 @@ - + @@ -100,19 +100,19 @@ - + - + - + - + @@ -200,7 +200,7 @@ - + @@ -210,10 +210,6 @@ - - - - @@ -222,6 +218,14 @@ + + + + + + + + diff --git a/doc/common/tables/cinder-compute.xml b/doc/common/tables/cinder-compute.xml index c0076b89f4..2d203eef8f 100644 --- a/doc/common/tables/cinder-compute.xml +++ b/doc/common/tables/cinder-compute.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for common
(StrOpt) default availability zone to use when creating a new volume. If this is not set then we use the value from the storage_availability_zone option as the default availability_zone for new volumes.
default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN(ListOpt) list of logger=LEVEL pairsdefault_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN(ListOpt) List of logger=LEVEL pairs
default_notification_level = INFO
fatal_deprecations = False(BoolOpt) make deprecations fatal(BoolOpt) Make deprecations fatal
fatal_exception_format_errors = False
logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s(StrOpt) format string to use for log messages with context(StrOpt) Format string to use for log messages with context
logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d(StrOpt) data to append to log format when level is DEBUG(StrOpt) Data to append to log format when level is DEBUG
logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s(StrOpt) format string to use for log messages without context(StrOpt) Format string to use for log messages without context
logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s(StrOpt) prefix each line of exception output with this format(StrOpt) Prefix each line of exception output with this format
monkey_patch = False
syslog-log-facility = LOG_USER(StrOpt) syslog facility to receive log lines(StrOpt) Syslog facility to receive log lines
tcp_keepidle = 600until_refresh = 0 (IntOpt) count of reservations until usage is refreshed
use-syslog = False(BoolOpt) Use syslog for logging.
use_forwarded_for = False (BoolOpt) Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.use_stderr = True (BoolOpt) Log output to standard error
use-syslog = False(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and then will be changed in J to honor RFC5424
use-syslog-rfc-format = False(BoolOpt) (Optional) Use syslog rfc5424 format for logging. If enabled, will add APP-NAME (RFC5424) before the MSG part of the syslog message. The old format without APP-NAME is deprecated in I, and will be removed in J.
verbose = False (BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level).
+
diff --git a/doc/common/tables/cinder-connection.xml b/doc/common/tables/cinder-connection.xml index 4ab388d794..5b95a79392 100644 --- a/doc/common/tables/cinder-connection.xml +++ b/doc/common/tables/cinder-connection.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for compute
+
diff --git a/doc/common/tables/cinder-coraid.xml b/doc/common/tables/cinder-coraid.xml index c2e1b1b02c..c7f9528264 100644 --- a/doc/common/tables/cinder-coraid.xml +++ b/doc/common/tables/cinder-coraid.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for connection
+
diff --git a/doc/common/tables/cinder-database.xml b/doc/common/tables/cinder-database.xml index 7cbcd070f1..274aa09422 100644 --- a/doc/common/tables/cinder-database.xml +++ b/doc/common/tables/cinder-database.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for coraid
+
diff --git a/doc/common/tables/cinder-emc.xml b/doc/common/tables/cinder-emc.xml index 2107783e9e..4eb6c91b7c 100644 --- a/doc/common/tables/cinder-emc.xml +++ b/doc/common/tables/cinder-emc.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for database
+
@@ -22,6 +22,18 @@ + + + + + + + + + + + +
Description of configuration options for emc
cinder_emc_config_file = /etc/cinder/cinder_emc_config.xml (StrOpt) use this file for cinder emc plugin config data
max_luns_per_storage_group = 256(IntOpt) Default max number of LUNs in a storage group
naviseccli_path = (StrOpt) Naviseccli Path
storage_vnx_pool_name = None(StrOpt) ISCSI pool name
diff --git a/doc/common/tables/cinder-eqlx.xml b/doc/common/tables/cinder-eqlx.xml index 58030af814..52cc9ad981 100644 --- a/doc/common/tables/cinder-eqlx.xml +++ b/doc/common/tables/cinder-eqlx.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/cinder-hds.xml b/doc/common/tables/cinder-hds.xml index c0bb271359..dfc7949bf1 100644 --- a/doc/common/tables/cinder-hds.xml +++ b/doc/common/tables/cinder-hds.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for eqlx
+
diff --git a/doc/common/tables/cinder-hp3par.xml b/doc/common/tables/cinder-hp3par.xml index 5363aa3e38..6b6cd3a05d 100644 --- a/doc/common/tables/cinder-hp3par.xml +++ b/doc/common/tables/cinder-hp3par.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for hds
+
diff --git a/doc/common/tables/cinder-hplefthand.xml b/doc/common/tables/cinder-hplefthand.xml index 4bd28259b9..5bf2ad3a1e 100644 --- a/doc/common/tables/cinder-hplefthand.xml +++ b/doc/common/tables/cinder-hplefthand.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for hp3par
+
diff --git a/doc/common/tables/cinder-hpmsa.xml b/doc/common/tables/cinder-hpmsa.xml index 59228f9e17..4dd5fb707b 100644 --- a/doc/common/tables/cinder-hpmsa.xml +++ b/doc/common/tables/cinder-hpmsa.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for hplefthand
+
diff --git a/doc/common/tables/cinder-huawei.xml b/doc/common/tables/cinder-huawei.xml index a95c2dfe5f..321985fca8 100644 --- a/doc/common/tables/cinder-huawei.xml +++ b/doc/common/tables/cinder-huawei.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for hpmsa
+
diff --git a/doc/common/tables/cinder-images.xml b/doc/common/tables/cinder-images.xml index 6a7ca8fa33..f946bd3bb4 100644 --- a/doc/common/tables/cinder-images.xml +++ b/doc/common/tables/cinder-images.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for huawei
+
diff --git a/doc/common/tables/cinder-keymgr.xml b/doc/common/tables/cinder-keymgr.xml index 4c9906b868..7f87deaa45 100644 --- a/doc/common/tables/cinder-keymgr.xml +++ b/doc/common/tables/cinder-keymgr.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for images
+
diff --git a/doc/common/tables/cinder-lvm.xml b/doc/common/tables/cinder-lvm.xml index c42ab715ee..39ae7cb963 100644 --- a/doc/common/tables/cinder-lvm.xml +++ b/doc/common/tables/cinder-lvm.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for keymgr
+
diff --git a/doc/common/tables/cinder-nas.xml b/doc/common/tables/cinder-nas.xml index 65121c393b..dce89ba518 100644 --- a/doc/common/tables/cinder-nas.xml +++ b/doc/common/tables/cinder-nas.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for lvm
+
diff --git a/doc/common/tables/cinder-netapp_7mode_iscsi.xml b/doc/common/tables/cinder-netapp_7mode_iscsi.xml index 89b7ae3553..ceafa63635 100644 --- a/doc/common/tables/cinder-netapp_7mode_iscsi.xml +++ b/doc/common/tables/cinder-netapp_7mode_iscsi.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for nas
+
@@ -20,7 +20,7 @@ - + @@ -28,11 +28,11 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/doc/common/tables/cinder-netapp_7mode_nfs.xml b/doc/common/tables/cinder-netapp_7mode_nfs.xml index 7a7fa6c9ed..05b9c10c4e 100644 --- a/doc/common/tables/cinder-netapp_7mode_nfs.xml +++ b/doc/common/tables/cinder-netapp_7mode_nfs.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for netapp_7mode_iscsi
netapp_login = None(StrOpt) Administrative user account name used to access the storage system.(StrOpt) Administrative user account name used to access the storage system or proxy server.
netapp_password = None
netapp_server_hostname = None(StrOpt) The hostname (or IP address) for the storage system.(StrOpt) The hostname (or IP address) for the storage system or proxy server.
netapp_server_port = 80(IntOpt) The TCP port to use for communication with ONTAPI on the storage system. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system.(IntOpt) The TCP port to use for communication with the storage system or proxy server. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system or proxy server.
netapp_size_multiplier = 1.2
netapp_storage_family = ontap_cluster(StrOpt) The storage family type used on the storage system; valid values are ontap_7mode for using Data ONTAP operating in 7-Mode or ontap_cluster for using clustered Data ONTAP.(StrOpt) The storage family type used on the storage system; valid values are ontap_7mode for using Data ONTAP operating in 7-Mode, ontap_cluster for using clustered Data ONTAP, or eseries for using E-Series.
netapp_storage_protocol = None
netapp_transport_type = http(StrOpt) The transport protocol used when communicating with ONTAPI on the storage system. Valid values are http or https.(StrOpt) The transport protocol used when communicating with the storage system or proxy server. Valid values are http or https.
netapp_vfiler = None
+
@@ -24,7 +24,7 @@ - + @@ -32,15 +32,15 @@ - + - + - + @@ -48,7 +48,7 @@ - + diff --git a/doc/common/tables/cinder-netapp_cdot_iscsi.xml b/doc/common/tables/cinder-netapp_cdot_iscsi.xml index 2e14a5cfeb..de5c345629 100644 --- a/doc/common/tables/cinder-netapp_cdot_iscsi.xml +++ b/doc/common/tables/cinder-netapp_cdot_iscsi.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for netapp_7mode_nfs
netapp_login = None(StrOpt) Administrative user account name used to access the storage system.(StrOpt) Administrative user account name used to access the storage system or proxy server.
netapp_password = None
netapp_server_hostname = None(StrOpt) The hostname (or IP address) for the storage system.(StrOpt) The hostname (or IP address) for the storage system or proxy server.
netapp_server_port = 80(IntOpt) The TCP port to use for communication with ONTAPI on the storage system. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system.(IntOpt) The TCP port to use for communication with the storage system or proxy server. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system or proxy server.
netapp_storage_family = ontap_cluster(StrOpt) The storage family type used on the storage system; valid values are ontap_7mode for using Data ONTAP operating in 7-Mode or ontap_cluster for using clustered Data ONTAP.(StrOpt) The storage family type used on the storage system; valid values are ontap_7mode for using Data ONTAP operating in 7-Mode, ontap_cluster for using clustered Data ONTAP, or eseries for using E-Series.
netapp_storage_protocol = None
netapp_transport_type = http(StrOpt) The transport protocol used when communicating with ONTAPI on the storage system. Valid values are http or https.(StrOpt) The transport protocol used when communicating with the storage system or proxy server. Valid values are http or https.
thres_avl_size_perc_start = 20
+
@@ -20,7 +20,7 @@ - + @@ -28,11 +28,11 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/doc/common/tables/cinder-netapp_cdot_nfs.xml b/doc/common/tables/cinder-netapp_cdot_nfs.xml index 6916e2ceea..216e548d4f 100644 --- a/doc/common/tables/cinder-netapp_cdot_nfs.xml +++ b/doc/common/tables/cinder-netapp_cdot_nfs.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for netapp_cdot_iscsi
netapp_login = None(StrOpt) Administrative user account name used to access the storage system.(StrOpt) Administrative user account name used to access the storage system or proxy server.
netapp_password = None
netapp_server_hostname = None(StrOpt) The hostname (or IP address) for the storage system.(StrOpt) The hostname (or IP address) for the storage system or proxy server.
netapp_server_port = 80(IntOpt) The TCP port to use for communication with ONTAPI on the storage system. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system.(IntOpt) The TCP port to use for communication with the storage system or proxy server. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system or proxy server.
netapp_size_multiplier = 1.2
netapp_storage_family = ontap_cluster(StrOpt) The storage family type used on the storage system; valid values are ontap_7mode for using Data ONTAP operating in 7-Mode or ontap_cluster for using clustered Data ONTAP.(StrOpt) The storage family type used on the storage system; valid values are ontap_7mode for using Data ONTAP operating in 7-Mode, ontap_cluster for using clustered Data ONTAP, or eseries for using E-Series.
netapp_storage_protocol = None
netapp_transport_type = http(StrOpt) The transport protocol used when communicating with ONTAPI on the storage system. Valid values are http or https.(StrOpt) The transport protocol used when communicating with the storage system or proxy server. Valid values are http or https.
netapp_vserver = None
+
@@ -28,7 +28,7 @@ - + @@ -36,15 +36,15 @@ - + - + - + @@ -52,7 +52,7 @@ - + diff --git a/doc/common/tables/cinder-netapp_eseries_iscsi.xml b/doc/common/tables/cinder-netapp_eseries_iscsi.xml index a5dee17f70..8120a5849e 100644 --- a/doc/common/tables/cinder-netapp_eseries_iscsi.xml +++ b/doc/common/tables/cinder-netapp_eseries_iscsi.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for netapp_cdot_nfs
netapp_login = None(StrOpt) Administrative user account name used to access the storage system.(StrOpt) Administrative user account name used to access the storage system or proxy server.
netapp_password = None
netapp_server_hostname = None(StrOpt) The hostname (or IP address) for the storage system.(StrOpt) The hostname (or IP address) for the storage system or proxy server.
netapp_server_port = 80(IntOpt) The TCP port to use for communication with ONTAPI on the storage system. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system.(IntOpt) The TCP port to use for communication with the storage system or proxy server. Traditionally, port 80 is used for HTTP and port 443 is used for HTTPS; however, this value should be changed if an alternate port has been configured on the storage system or proxy server.
netapp_storage_family = ontap_cluster(StrOpt) The storage family type used on the storage system; valid values are ontap_7mode for using Data ONTAP operating in 7-Mode or ontap_cluster for using clustered Data ONTAP.(StrOpt) The storage family type used on the storage system; valid values are ontap_7mode for using Data ONTAP operating in 7-Mode, ontap_cluster for using clustered Data ONTAP, or eseries for using E-Series.
netapp_storage_protocol = None
netapp_transport_type = http(StrOpt) The transport protocol used when communicating with ONTAPI on the storage system. Valid values are http or https.(StrOpt) The transport protocol used when communicating with the storage system or proxy server. Valid values are http or https.
netapp_vserver = None
+
diff --git a/doc/common/tables/cinder-nexenta_iscsi.xml b/doc/common/tables/cinder-nexenta_iscsi.xml index 4d6d3325c1..5543bb25e7 100644 --- a/doc/common/tables/cinder-nexenta_iscsi.xml +++ b/doc/common/tables/cinder-nexenta_iscsi.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for netapp_eseries_iscsi
+
diff --git a/doc/common/tables/cinder-nexenta_nfs.xml b/doc/common/tables/cinder-nexenta_nfs.xml index 04c719308a..87814bb84d 100644 --- a/doc/common/tables/cinder-nexenta_nfs.xml +++ b/doc/common/tables/cinder-nexenta_nfs.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for nexenta_iscsi
+
diff --git a/doc/common/tables/cinder-quota.xml b/doc/common/tables/cinder-quota.xml index 2bf7b5ed49..4fd1d976dd 100644 --- a/doc/common/tables/cinder-quota.xml +++ b/doc/common/tables/cinder-quota.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for nexenta_nfs
+
diff --git a/doc/common/tables/cinder-rpc.xml b/doc/common/tables/cinder-rpc.xml index 4595f13ecd..3daac4e245 100644 --- a/doc/common/tables/cinder-rpc.xml +++ b/doc/common/tables/cinder-rpc.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for quota
+
@@ -34,6 +34,10 @@ + + + + @@ -72,7 +76,7 @@ - + @@ -217,6 +221,21 @@ + + + + + + + + + + + + + + +
Description of configuration options for rpc
control_exchange = openstack (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid
default_timeout = 20(IntOpt) Default Time Out For CLI operations in minutes
fake_rabbit = False (BoolOpt) If passed, use a fake RabbitMQ provider
publish_errors = False(BoolOpt) publish error events(BoolOpt) Publish error events
qpid_heartbeat = 60ringfile = /etc/oslo/matchmaker_ring.json (StrOpt) Matchmaker ring file (JSON)
[DEFAULT]
port = 6379(IntOpt) Use this port to connect to redis host.
password = None(StrOpt) Password for Redis server. (optional)
transport_url = None(StrOpt) A URL representing the messaging driver to use and its full configuration. If not set, we fall back to the rpc_backend option and driver specific configuration.
diff --git a/doc/common/tables/cinder-san-solaris.xml b/doc/common/tables/cinder-san-solaris.xml index 92e2b968a3..0a1b015291 100644 --- a/doc/common/tables/cinder-san-solaris.xml +++ b/doc/common/tables/cinder-san-solaris.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/cinder-san.xml b/doc/common/tables/cinder-san.xml index 2f5e849ff6..f8807a005e 100644 --- a/doc/common/tables/cinder-san.xml +++ b/doc/common/tables/cinder-san.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for san-solaris
+
diff --git a/doc/common/tables/cinder-scality.xml b/doc/common/tables/cinder-scality.xml index 6d401c978c..f118743aef 100644 --- a/doc/common/tables/cinder-scality.xml +++ b/doc/common/tables/cinder-scality.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for san
+
diff --git a/doc/common/tables/cinder-scheduler.xml b/doc/common/tables/cinder-scheduler.xml index 3462c46730..34f2f02ca2 100644 --- a/doc/common/tables/cinder-scheduler.xml +++ b/doc/common/tables/cinder-scheduler.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for scality
+
diff --git a/doc/common/tables/cinder-solidfire.xml b/doc/common/tables/cinder-solidfire.xml index fafcfb6dbe..94c4263856 100644 --- a/doc/common/tables/cinder-solidfire.xml +++ b/doc/common/tables/cinder-solidfire.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for scheduler
+
diff --git a/doc/common/tables/cinder-ssl.xml b/doc/common/tables/cinder-ssl.xml index 37daeffd30..9ad62614b8 100644 --- a/doc/common/tables/cinder-ssl.xml +++ b/doc/common/tables/cinder-ssl.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for solidfire
+
diff --git a/doc/common/tables/cinder-storage.xml b/doc/common/tables/cinder-storage.xml index bb0cf746b5..9294917573 100644 --- a/doc/common/tables/cinder-storage.xml +++ b/doc/common/tables/cinder-storage.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ssl
+
diff --git a/doc/common/tables/cinder-storage_ceph.xml b/doc/common/tables/cinder-storage_ceph.xml index 56b584298b..91c5c87264 100644 --- a/doc/common/tables/cinder-storage_ceph.xml +++ b/doc/common/tables/cinder-storage_ceph.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for storage
+
diff --git a/doc/common/tables/cinder-storage_glusterfs.xml b/doc/common/tables/cinder-storage_glusterfs.xml index c0f200b291..2df7f980dc 100644 --- a/doc/common/tables/cinder-storage_glusterfs.xml +++ b/doc/common/tables/cinder-storage_glusterfs.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for storage_ceph
+
diff --git a/doc/common/tables/cinder-storage_gpfs.xml b/doc/common/tables/cinder-storage_gpfs.xml index 9daef4c4a9..af62e86722 100644 --- a/doc/common/tables/cinder-storage_gpfs.xml +++ b/doc/common/tables/cinder-storage_gpfs.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for storage_glusterfs
+
diff --git a/doc/common/tables/cinder-storage_nfs.xml b/doc/common/tables/cinder-storage_nfs.xml index a2b9555f11..4cb5f1c8e9 100644 --- a/doc/common/tables/cinder-storage_nfs.xml +++ b/doc/common/tables/cinder-storage_nfs.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for storage_gpfs
+
diff --git a/doc/common/tables/cinder-storage_xen.xml b/doc/common/tables/cinder-storage_xen.xml index be2ea1a2a0..ac7071cb98 100644 --- a/doc/common/tables/cinder-storage_xen.xml +++ b/doc/common/tables/cinder-storage_xen.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for storage_nfs
+
diff --git a/doc/common/tables/cinder-storwize.xml b/doc/common/tables/cinder-storwize.xml index 0f6af37c1e..14ab6f628a 100644 --- a/doc/common/tables/cinder-storwize.xml +++ b/doc/common/tables/cinder-storwize.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for storage_xen
+
diff --git a/doc/common/tables/cinder-vmware.xml b/doc/common/tables/cinder-vmware.xml index 4664cb7da4..3ea9a0930b 100644 --- a/doc/common/tables/cinder-vmware.xml +++ b/doc/common/tables/cinder-vmware.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for storwize
+
@@ -18,6 +18,10 @@ + + + + @@ -34,6 +38,10 @@ + + + + diff --git a/doc/common/tables/cinder-windows.xml b/doc/common/tables/cinder-windows.xml index 8132aa55c7..0d72b580fa 100644 --- a/doc/common/tables/cinder-windows.xml +++ b/doc/common/tables/cinder-windows.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for vmware
[DEFAULT]
pbm_default_policy = None(StrOpt) The PBM default policy. If using VC server version 5.5 or above and there is no defined storage policy for the specific request then this policy will be used.
vmware_api_retry_count = 10 (IntOpt) Number of times VMware ESX/VC server API must be retried upon connection related issues.vmware_host_username = None (StrOpt) Username for authenticating with VMware ESX/VC server.
vmware_host_version = None(StrOpt) Optional string specifying the VMware VC server version. The driver attempts to retrieve the version from VMware VC server. Set this configuration only if you want to override the VC server version.
vmware_image_transfer_timeout_secs = 7200 (IntOpt) Timeout in seconds for VMDK volume transfer between Cinder and Glance.
+
diff --git a/doc/common/tables/cinder-xiv.xml b/doc/common/tables/cinder-xiv.xml index 4b51ba70c6..313b4f16a2 100644 --- a/doc/common/tables/cinder-xiv.xml +++ b/doc/common/tables/cinder-xiv.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for windows
+
diff --git a/doc/common/tables/cinder-zadara.xml b/doc/common/tables/cinder-zadara.xml index aedfc4a466..fa15573849 100644 --- a/doc/common/tables/cinder-zadara.xml +++ b/doc/common/tables/cinder-zadara.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for xiv
+
diff --git a/doc/common/tables/cinder-zones.xml b/doc/common/tables/cinder-zones.xml index 82e2e06aa9..3cef453ae9 100644 --- a/doc/common/tables/cinder-zones.xml +++ b/doc/common/tables/cinder-zones.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for zadara
+
diff --git a/doc/common/tables/cinder-zoning.xml b/doc/common/tables/cinder-zoning.xml index 011a71cbf7..4c1f8b7e42 100644 --- a/doc/common/tables/cinder-zoning.xml +++ b/doc/common/tables/cinder-zoning.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for zones
+
@@ -22,60 +22,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/common/tables/cinder-zoning_fabric.xml b/doc/common/tables/cinder-zoning_fabric.xml new file mode 100644 index 0000000000..c239692712 --- /dev/null +++ b/doc/common/tables/cinder-zoning_fabric.xml @@ -0,0 +1,55 @@ + + + +
Description of configuration options for zoning
zoning_mode = none (StrOpt) FC Zoning mode configured
[BRCD_FABRIC_EXAMPLE]
fc_fabric_address = (StrOpt) Management IP of fabric
fc_fabric_password = (StrOpt) Password for user
fc_fabric_port = 22(IntOpt) Connecting port
fc_fabric_user = (StrOpt) Fabric user ID
principal_switch_wwn = None(StrOpt) Principal switch WWN of the fabric
zone_activate = True(BoolOpt) overridden zoning activation state
zone_name_prefix = None(StrOpt) overridden zone name prefix
zoning_policy = initiator-target(StrOpt) overridden zoning policy
[fc-zone-manager]
brcd_sb_connector = cinder.zonemanager.drivers.brocade.brcd_fc_zone_client_cli.BrcdFCZoneClientCLI(StrOpt) Southbound connector for zoning operation
fc_fabric_names = None (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
fc_san_lookup_service = cinder.zonemanager.drivers.brocade.brcd_fc_san_lookup_service.BrcdFCSanLookupService(StrOpt) FC San Lookup Service
zone_driver = cinder.zonemanager.drivers.brocade.brcd_fc_zone_driver.BrcdFCZoneDriver(StrOpt) FC Zone Driver responsible for zone management
zoning_policy = initiator-target (StrOpt) Zoning policy configured by user
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for zoning_fabric
Configuration option = Default valueDescription
[BRCD_FABRIC_EXAMPLE]
fc_fabric_address = (StrOpt) Management IP of fabric
fc_fabric_password = (StrOpt) Password for user
fc_fabric_port = 22(IntOpt) Connecting port
fc_fabric_user = (StrOpt) Fabric user ID
principal_switch_wwn = None(StrOpt) Principal switch WWN of the fabric
zone_activate = True(BoolOpt) overridden zoning activation state
zone_name_prefix = None(StrOpt) overridden zone name prefix
zoning_policy = initiator-target(StrOpt) overridden zoning policy
+ diff --git a/doc/common/tables/cinder-zoning_manager.xml b/doc/common/tables/cinder-zoning_manager.xml new file mode 100644 index 0000000000..de83126882 --- /dev/null +++ b/doc/common/tables/cinder-zoning_manager.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for zoning_manager
Configuration option = Default valueDescription
[fc-zone-manager]
brcd_sb_connector = cinder.zonemanager.drivers.brocade.brcd_fc_zone_client_cli.BrcdFCZoneClientCLI(StrOpt) Southbound connector for zoning operation
fc_san_lookup_service = cinder.zonemanager.drivers.brocade.brcd_fc_san_lookup_service.BrcdFCSanLookupService(StrOpt) FC San Lookup Service
zone_driver = cinder.zonemanager.drivers.brocade.brcd_fc_zone_driver.BrcdFCZoneDriver(StrOpt) FC Zone Driver responsible for zone management
+ diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 2a53e9935b..e5779498a4 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -50,6 +50,7 @@ default_availability_zone common default_log_levels common default_notification_level common default_publisher_id common +default_timeout rpc default_volume_type common disable_process_locking common enable_new_services common @@ -64,6 +65,7 @@ eqlx_group_name eqlx eqlx_pool eqlx eqlx_use_chap eqlx expiry_thres_minutes netapp_7mode_nfs netapp_cdot_nfs +extra_capabilities api fake_rabbit rpc fatal_deprecations common fatal_exception_format_errors common @@ -123,11 +125,11 @@ kombu_ssl_keyfile rpc kombu_ssl_version rpc lio_initiator_iqns common lock_path common -log-config-append common -log-date-format common -log-dir common -log-file common -log-format common +log_config_append common +log_date_format common +log_dir common +log_file common +log_format common logging_context_format_string common logging_debug_format_suffix common logging_default_format_string common @@ -139,6 +141,7 @@ matchmaker_heartbeat_ttl rpc max_age quota max_gigabytes storage max_header_line api +max_luns_per_storage_group emc migration_create_volume_timeout_secs storage monkey_patch common monkey_patch_modules common @@ -149,6 +152,7 @@ nas_login nas nas_password nas nas_private_key nas nas_ssh_port nas +naviseccli_path emc netapp_controller_ips netapp_eseries_iscsi netapp_copyoffload_tool_path netapp_cdot_nfs netapp_login netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_eseries_iscsi @@ -211,6 +215,7 @@ osapi_volume_extension api osapi_volume_listen api osapi_volume_listen_port api osapi_volume_workers api +pbm_default_policy vmware periodic_fuzzy_delay common periodic_interval common policy_default_rule common @@ -302,6 +307,7 @@ ssl_cert_file common ssl_key_file common state_path common storage_availability_zone common +storage_vnx_pool_name emc storwize_svc_connection_protocol storwize storwize_svc_flashcopy_timeout storwize storwize_svc_iscsi_chap_enabled storwize @@ -315,22 +321,24 @@ storwize_svc_vol_iogrp storwize storwize_svc_vol_rsize storwize storwize_svc_vol_warning storwize storwize_svc_volpool_name storwize -syslog-log-facility common +syslog_log_facility common tcp_keepidle common thres_avl_size_perc_start netapp_7mode_nfs netapp_cdot_nfs thres_avl_size_perc_stop netapp_7mode_nfs netapp_cdot_nfs transfer_api_class api until_refresh common -use-syslog common use_default_quota_class quota use_forwarded_for common use_multipath_for_image_xfer images use_stderr common +use_syslog common +use_syslog_rfc_format common verbose common vmware_api_retry_count vmware vmware_host_ip vmware vmware_host_password vmware vmware_host_username vmware +vmware_host_version vmware vmware_image_transfer_timeout_secs vmware vmware_max_objects_retrieval vmware vmware_task_poll_interval vmware @@ -349,6 +357,8 @@ volume_name_template api volume_service_inithost_offload storage volume_tmp_dir storage_ceph volume_topic rpc +volume_transfer_key_length api +volume_transfer_salt_length api volume_usage_audit_period storage volumes_dir storage windows_iscsi_lun_path windows @@ -372,14 +382,14 @@ zadara_vpsa_poolname zadara zadara_vpsa_port zadara zadara_vpsa_use_ssl zadara zoning_mode zoning -BRCD_FABRIC_EXAMPLE/fc_fabric_address zoning -BRCD_FABRIC_EXAMPLE/fc_fabric_password zoning -BRCD_FABRIC_EXAMPLE/fc_fabric_port zoning -BRCD_FABRIC_EXAMPLE/fc_fabric_user zoning -BRCD_FABRIC_EXAMPLE/principal_switch_wwn zoning -BRCD_FABRIC_EXAMPLE/zone_activate zoning -BRCD_FABRIC_EXAMPLE/zone_name_prefix zoning -BRCD_FABRIC_EXAMPLE/zoning_policy 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_user 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 database/backend storage database/connection connection database/connection_debug connection @@ -391,10 +401,10 @@ database/max_retries storage database/min_pool_size storage database/retry_interval common database/use_tpool common -fc-zone-manager/brcd_sb_connector zoning +fc-zone-manager/brcd_sb_connector zoning_manager fc-zone-manager/fc_fabric_names zoning -fc-zone-manager/fc_san_lookup_service zoning -fc-zone-manager/zone_driver zoning +fc-zone-manager/fc_san_lookup_service zoning_manager +fc-zone-manager/zone_driver zoning_manager fc-zone-manager/zoning_policy zoning keymgr/api_class keymgr keymgr/fixed_key keymgr @@ -406,3 +416,6 @@ rpc_notifier2/topics common ssl/ca_file ssl ssl/cert_file ssl ssl/key_file ssl +port rpc +password rpc +transport_url rpc