From 96931557e06a1b80b0eaaba7a8a2ba6f40a483f9 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Sun, 2 Mar 2014 12:14:53 +0100 Subject: [PATCH] Update cinder config reference tables The mapping file and xml table have been generated using the autohelp.py script from openstack-doc-tools. Change-Id: Iec1d8b7d17a5b2b666b0faf7aed141c7179d0440 --- doc/common/tables/cinder-api.xml | 8 ++ doc/common/tables/cinder-backups.xml | 4 + doc/common/tables/cinder-backups_ceph.xml | 14 +-- doc/common/tables/cinder-common.xml | 14 +-- doc/common/tables/cinder-compute.xml | 2 +- doc/common/tables/cinder-emc.xml | 27 ++++++ doc/common/tables/cinder-hplefthand.xml | 47 ++++++++++ doc/common/tables/cinder-hpmsa.xml | 27 ++++++ doc/common/tables/cinder-nas.xml | 43 ++++++++++ doc/common/tables/cinder-nexenta_nfs.xml | 12 --- doc/common/tables/cinder-rpc.xml | 16 +--- doc/common/tables/cinder-ssl.xml | 35 ++++++++ doc/common/tables/cinder-storage.xml | 12 +-- doc/common/tables/cinder-storage_gpfs.xml | 4 + doc/common/tables/cinder-vmware.xml | 2 +- doc/common/tables/cinder-zadara.xml | 4 - doc/common/tables/cinder-zoning.xml | 85 +++++++++++++++++++ .../cinder.flagmappings | 48 ++++++++--- 18 files changed, 335 insertions(+), 69 deletions(-) create mode 100644 doc/common/tables/cinder-emc.xml create mode 100644 doc/common/tables/cinder-hplefthand.xml create mode 100644 doc/common/tables/cinder-hpmsa.xml create mode 100644 doc/common/tables/cinder-nas.xml create mode 100644 doc/common/tables/cinder-ssl.xml create mode 100644 doc/common/tables/cinder-zoning.xml diff --git a/doc/common/tables/cinder-api.xml b/doc/common/tables/cinder-api.xml index b93b4ff85a..d83f7e5e7d 100644 --- a/doc/common/tables/cinder-api.xml +++ b/doc/common/tables/cinder-api.xml @@ -38,6 +38,10 @@ enable_v2_api = True (BoolOpt) Deploy v2 of the Cinder API. + + 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). + osapi_max_limit = 1000 (IntOpt) the maximum number of items returned in a single response from a collection resource @@ -66,6 +70,10 @@ osapi_volume_listen_port = 8776 (IntOpt) port for os volume api to listen + + osapi_volume_workers = None + (IntOpt) Number of workers for OpenStack Volume API service + transfer_api_class = cinder.transfer.api.API (StrOpt) The full class name of the volume transfer API class diff --git a/doc/common/tables/cinder-backups.xml b/doc/common/tables/cinder-backups.xml index 6342af7e2a..7f75882594 100644 --- a/doc/common/tables/cinder-backups.xml +++ b/doc/common/tables/cinder-backups.xml @@ -34,6 +34,10 @@ backup_manager = cinder.backup.manager.BackupManager (StrOpt) full class name for the Manager for volume backup + + backup_metadata_version = 1 + (IntOpt) Backup metadata version to be used when backing up volume metadata. If this number is bumped, make sure the service doing the restore supports the new version. + backup_name_template = backup-%s (StrOpt) Template string to be used to generate backup names diff --git a/doc/common/tables/cinder-backups_ceph.xml b/doc/common/tables/cinder-backups_ceph.xml index 67037f59a6..9d2ac630fc 100644 --- a/doc/common/tables/cinder-backups_ceph.xml +++ b/doc/common/tables/cinder-backups_ceph.xml @@ -20,31 +20,31 @@ backup_ceph_chunk_size = 134217728 - (IntOpt) the chunk size in bytes that a backup will be broken into before transfer to backup store + (IntOpt) The chunk size, in bytes, that a backup is broken into before transfer to the Ceph object store. backup_ceph_conf = /etc/ceph/ceph.conf - (StrOpt) Ceph config file to use. + (StrOpt) Ceph configuration file to use. backup_ceph_pool = backups - (StrOpt) the Ceph pool to backup to + (StrOpt) The Ceph pool where volume backups are stored. backup_ceph_stripe_count = 0 - (IntOpt) RBD stripe count to use when creating a backup image + (IntOpt) RBD stripe count to use when creating a backup image. backup_ceph_stripe_unit = 0 - (IntOpt) RBD stripe unit to use when creating a backup image + (IntOpt) RBD stripe unit to use when creating a backup image. backup_ceph_user = cinder - (StrOpt) the Ceph user to connect with + (StrOpt) The Ceph user to connect with. Default here is to use the same user as for Cinder volumes. If not using cephx this should be set to None. restore_discard_excess_bytes = True - (BoolOpt) If True, always discard excess bytes when restoring volumes. + (BoolOpt) If True, always discard excess bytes when restoring volumes i.e. pad with zeroes. diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml index 1382e23639..64a21d9c28 100644 --- a/doc/common/tables/cinder-common.xml +++ b/doc/common/tables/cinder-common.xml @@ -31,7 +31,7 @@ (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, keystone=INFO, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN + default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN (ListOpt) list of logger=LEVEL pairs @@ -99,7 +99,7 @@ (StrOpt) DEPRECATED. A logging.Formatter log message format string which may use any of the available logging.LogRecord attributes. This option is deprecated. Please use logging_context_format_string and logging_default_format_string instead. - logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user)s %(tenant)s] %(instance)s%(message)s + 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 @@ -150,10 +150,6 @@ policy_file = policy.json (StrOpt) JSON file representing policy - - pybasedir = /usr/lib/python/site-packages - (StrOpt) Directory where the cinder python module is installed - report_interval = 10 (IntOpt) seconds between nodes reporting state to datastore @@ -162,10 +158,6 @@ reserved_percentage = 0 (IntOpt) The percentage of backend capacity is reserved - - root_helper = sudo - (StrOpt) Deprecated: command to use for running commands as root - rootwrap_config = /etc/cinder/rootwrap.conf (StrOpt) Path to the rootwrap configuration file to use for running commands as root @@ -199,7 +191,7 @@ (StrOpt) Private key file to use when starting the server securely - state_path = $pybasedir + state_path = /var/lib/cinder (StrOpt) Top-level directory for maintaining cinder's state diff --git a/doc/common/tables/cinder-compute.xml b/doc/common/tables/cinder-compute.xml index e5e52a65d1..c0076b89f4 100644 --- a/doc/common/tables/cinder-compute.xml +++ b/doc/common/tables/cinder-compute.xml @@ -40,7 +40,7 @@ nova_endpoint_template = None - (StrOpt) Override service catalog lookup with template for nova endpoint e.g. http://localhost:8774/v2/%(tenant_id)s + (StrOpt) Override service catalog lookup with template for nova endpoint e.g. http://localhost:8774/v2/%(project_id)s os_region_name = None diff --git a/doc/common/tables/cinder-emc.xml b/doc/common/tables/cinder-emc.xml new file mode 100644 index 0000000000..2107783e9e --- /dev/null +++ b/doc/common/tables/cinder-emc.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for emc
Configuration option = Default valueDescription
[DEFAULT]
cinder_emc_config_file = /etc/cinder/cinder_emc_config.xml(StrOpt) use this file for cinder emc plugin config data
+ diff --git a/doc/common/tables/cinder-hplefthand.xml b/doc/common/tables/cinder-hplefthand.xml new file mode 100644 index 0000000000..4bd28259b9 --- /dev/null +++ b/doc/common/tables/cinder-hplefthand.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for hplefthand
Configuration option = Default valueDescription
[DEFAULT]
hplefthand_api_url = None(StrOpt) HP LeftHand WSAPI Server Url like https://<LeftHand ip>:8081/lhos
hplefthand_clustername = None(StrOpt) HP LeftHand cluster name
hplefthand_debug = False(BoolOpt) Enable HTTP debugging to LeftHand
hplefthand_iscsi_chap_enabled = False(BoolOpt) Configure CHAP authentication for iSCSI connections (Default: Disabled)
hplefthand_password = None(StrOpt) HP LeftHand Super user password
hplefthand_username = None(StrOpt) HP LeftHand Super user username
+ diff --git a/doc/common/tables/cinder-hpmsa.xml b/doc/common/tables/cinder-hpmsa.xml new file mode 100644 index 0000000000..59228f9e17 --- /dev/null +++ b/doc/common/tables/cinder-hpmsa.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for hpmsa
Configuration option = Default valueDescription
[DEFAULT]
msa_vdisk = OpenStack(StrOpt) The VDisk to use for volume creation.
+ diff --git a/doc/common/tables/cinder-nas.xml b/doc/common/tables/cinder-nas.xml new file mode 100644 index 0000000000..65121c393b --- /dev/null +++ b/doc/common/tables/cinder-nas.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for nas
Configuration option = Default valueDescription
[DEFAULT]
nas_ip = (StrOpt) IP address or Hostname of NAS system.
nas_login = admin(StrOpt) User name to connect to NAS system.
nas_password = (StrOpt) Password to connect to NAS system.
nas_private_key = (StrOpt) Filename of private key to use for SSH authentication.
nas_ssh_port = 22(IntOpt) SSH port to use to connect to NAS system.
+ diff --git a/doc/common/tables/cinder-nexenta_nfs.xml b/doc/common/tables/cinder-nexenta_nfs.xml index 62e4204434..04c719308a 100644 --- a/doc/common/tables/cinder-nexenta_nfs.xml +++ b/doc/common/tables/cinder-nexenta_nfs.xml @@ -18,10 +18,6 @@ [DEFAULT] - - nexenta_mount_options = None - (StrOpt) Mount options passed to the nfs client. See section of the nfs man page for details - nexenta_mount_point_base = $state_path/mnt (StrOpt) Base dir containing mount points for nfs shares @@ -30,18 +26,10 @@ nexenta_nms_cache_volroot = True (BoolOpt) If set True cache NexentaStor appliance volroot option value. - - nexenta_oversub_ratio = 1.0 - (FloatOpt) This will compare the allocated to available space on the volume destination. If the ratio exceeds this number, the destination will no longer be valid. - nexenta_shares_config = /etc/cinder/nfs_shares (StrOpt) File with the list of available nfs shares - - nexenta_used_ratio = 0.95 - (FloatOpt) Percent of ACTUAL usage of the underlying volume before no new volumes can be allocated to the volume destination. - nexenta_volume_compression = on (StrOpt) Default compression value for new ZFS folders. diff --git a/doc/common/tables/cinder-rpc.xml b/doc/common/tables/cinder-rpc.xml index 1a58c7db25..4595f13ecd 100644 --- a/doc/common/tables/cinder-rpc.xml +++ b/doc/common/tables/cinder-rpc.xml @@ -20,7 +20,7 @@ allowed_rpc_exception_modules = nova.exception, cinder.exception, exceptions - (ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call. + (ListOpt) Modules of exceptions that are permitted to be recreated upon receiving exception data from an rpc call. amqp_auto_delete = False @@ -30,10 +30,6 @@ amqp_durable_queues = False (BoolOpt) Use durable queues in amqp. - - amqp_rpc_single_reply_queue = False - (BoolOpt) Enable a fast single reply queue if using AMQP based RPC like RabbitMQ or Qpid. - control_exchange = openstack (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid @@ -56,7 +52,7 @@ kombu_ssl_version = - (StrOpt) SSL version to use (valid only if SSL enabled) + (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions matchmaker_heartbeat_freq = 300 @@ -66,10 +62,6 @@ matchmaker_heartbeat_ttl = 600 (IntOpt) Heartbeat time-to-live. - - matchmaker_ringfile = /etc/nova/matchmaker_ring.json - (StrOpt) Matchmaker ring file (JSON) - notification_driver = [] (MultiStrOpt) Driver or drivers to handle sending notifications @@ -87,7 +79,7 @@ (IntOpt) Seconds between connection keepalive heartbeats - qpid_hostname = localhost + qpid_hostname = oslo (StrOpt) Qpid broker hostname @@ -127,7 +119,7 @@ (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to wipe RabbitMQ database when changing this option. - rabbit_host = localhost + rabbit_host = oslo (StrOpt) The RabbitMQ broker address where a single node is used diff --git a/doc/common/tables/cinder-ssl.xml b/doc/common/tables/cinder-ssl.xml new file mode 100644 index 0000000000..37daeffd30 --- /dev/null +++ b/doc/common/tables/cinder-ssl.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for ssl
Configuration option = Default valueDescription
[ssl]
ca_file = None(StrOpt) CA certificate file to use to verify connecting clients
cert_file = None(StrOpt) Certificate file to use when starting the server securely
key_file = None(StrOpt) Private key file to use when starting the server securely
+ diff --git a/doc/common/tables/cinder-storage.xml b/doc/common/tables/cinder-storage.xml index 9d04ac91cf..bb0cf746b5 100644 --- a/doc/common/tables/cinder-storage.xml +++ b/doc/common/tables/cinder-storage.xml @@ -22,10 +22,6 @@ allocated_capacity_weight_multiplier = -1.0 (FloatOpt) Multiplier used for weighing volume capacity. Negative numbers mean to stack vs spread. - - bindir = $pybasedir/bin - (StrOpt) Directory where cinder binaries are installed - capacity_weight_multiplier = 1.0 (FloatOpt) Multiplier used for weighing volume capacity. Negative numbers mean to stack vs spread. @@ -102,6 +98,10 @@ volume_clear = zero (StrOpt) Method used to wipe old voumes (valid options are: none, zero, shred) + + volume_clear_ionice = None + (StrOpt) The flag to pass to ionice to alter the i/o priority of the process used to zero a volume after deletion, for example "-c3" for idle only priority. + volume_clear_size = 0 (IntOpt) Size in MiB to wipe at start of old volumes. 0 => all @@ -130,10 +130,6 @@ volumes_dir = $state_path/volumes (StrOpt) Volume configuration file storage directory - - zadara_default_stripesize = 64 - (StrOpt) Default stripe size for volumes - [database] diff --git a/doc/common/tables/cinder-storage_gpfs.xml b/doc/common/tables/cinder-storage_gpfs.xml index 5069d5c059..9daef4c4a9 100644 --- a/doc/common/tables/cinder-storage_gpfs.xml +++ b/doc/common/tables/cinder-storage_gpfs.xml @@ -38,6 +38,10 @@ gpfs_sparse_volumes = True (BoolOpt) Specifies that volumes are created as sparse files which initially consume no space. If set to False, the volume is created as a fully allocated file, in which case, creation may take a significantly longer time. + + gpfs_storage_pool = None + (StrOpt) Specifies the storage pool that volumes are assigned to. By default, the system storage pool is used. + diff --git a/doc/common/tables/cinder-vmware.xml b/doc/common/tables/cinder-vmware.xml index ea642a72d4..4664cb7da4 100644 --- a/doc/common/tables/cinder-vmware.xml +++ b/doc/common/tables/cinder-vmware.xml @@ -44,7 +44,7 @@ vmware_task_poll_interval = 5 - (IntOpt) The interval used for polling remote tasks invoked on VMware ESX/VC server. + (IntOpt) The interval (in seconds) for polling remote tasks invoked on VMware ESX/VC server. vmware_volume_folder = cinder-volumes diff --git a/doc/common/tables/cinder-zadara.xml b/doc/common/tables/cinder-zadara.xml index 7b1afcceea..aedfc4a466 100644 --- a/doc/common/tables/cinder-zadara.xml +++ b/doc/common/tables/cinder-zadara.xml @@ -18,10 +18,6 @@ [DEFAULT] - - zadara_default_striping_mode = simple - (StrOpt) Default striping mode for volumes - zadara_password = None (StrOpt) Password for the VPSA diff --git a/doc/common/tables/cinder-zoning.xml b/doc/common/tables/cinder-zoning.xml new file mode 100644 index 0000000000..011a71cbf7 --- /dev/null +++ b/doc/common/tables/cinder-zoning.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for zoning
Configuration option = Default valueDescription
[DEFAULT]
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
+ diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index f41f251426..e92ea04a2f 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -3,13 +3,11 @@ allowed_direct_url_schemes images allowed_rpc_exception_modules rpc amqp_auto_delete rpc amqp_durable_queues rpc -amqp_rpc_single_reply_queue rpc api_paste_config api api_rate_limit api auth_strategy auth available_devices block-device backdoor_port api -backlog log backup_api_class backups backup_ceph_chunk_size backups_ceph backup_ceph_conf backups_ceph @@ -20,6 +18,7 @@ backup_ceph_user backups_ceph backup_compression_algorithm backups backup_driver backups backup_manager backups +backup_metadata_version backups backup_name_template backups backup_swift_auth backups_swift backup_swift_container backups_swift @@ -33,8 +32,8 @@ backup_topic backups backup_tsm_compression backups_tsm backup_tsm_password backups_tsm backup_tsm_volume_prefix backups_tsm -bindir storage capacity_weight_multiplier storage +cinder_emc_config_file emc cinder_huawei_conf_file huawei cloned_volume_same_az zones compute_api_class common @@ -66,7 +65,6 @@ eqlx_pool eqlx eqlx_use_chap eqlx expiry_thres_minutes netapp_7mode_nfs netapp_cdot_nfs fake_rabbit rpc -fake_tests Unknown fatal_deprecations common fatal_exception_format_errors common glance_api_insecure images @@ -86,6 +84,7 @@ gpfs_images_share_mode storage_gpfs gpfs_max_clone_depth storage_gpfs gpfs_mount_point_base storage_gpfs gpfs_sparse_volumes storage_gpfs +gpfs_storage_pool storage_gpfs hds_cinder_config_file hds host common hp3par_api_url hp3par @@ -97,6 +96,12 @@ hp3par_password hp3par hp3par_snapshot_expiration hp3par hp3par_snapshot_retention hp3par hp3par_username hp3par +hplefthand_api_url hplefthand +hplefthand_clustername hplefthand +hplefthand_debug hplefthand +hplefthand_iscsi_chap_enabled hplefthand +hplefthand_password hplefthand +hplefthand_username hplefthand iet_conf common image_conversion_dir images instance_format images @@ -131,13 +136,19 @@ lvm_mirrors lvm lvm_type lvm matchmaker_heartbeat_freq rpc matchmaker_heartbeat_ttl rpc -matchmaker_ringfile rpc max_age quota max_gigabytes storage +max_header_line api migration_create_volume_timeout_secs storage monkey_patch common monkey_patch_modules common +msa_vdisk hpmsa my_ip common +nas_ip nas +nas_login nas +nas_password nas +nas_private_key nas +nas_ssh_port nas netapp_login netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_password netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_server_hostname netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs @@ -152,10 +163,8 @@ netapp_vserver netapp_cdot_iscsi netapp_cdot_nfs nexenta_blocksize nexenta_iscsi nexenta_host nexenta_iscsi nexenta_iscsi_target_portal_port nexenta_iscsi -nexenta_mount_options nexenta_nfs nexenta_mount_point_base nexenta_nfs nexenta_nms_cache_volroot nexenta_nfs -nexenta_oversub_ratio nexenta_nfs nexenta_password nexenta_iscsi nexenta_rest_port nexenta_iscsi nexenta_rest_protocol nexenta_iscsi @@ -167,7 +176,6 @@ nexenta_sparse nexenta_iscsi nexenta_sparsed_volumes nexenta_iscsi nexenta_target_group_prefix nexenta_iscsi nexenta_target_prefix nexenta_iscsi -nexenta_used_ratio nexenta_nfs nexenta_user nexenta_iscsi nexenta_volume nexenta_iscsi nexenta_volume_compression nexenta_nfs @@ -197,12 +205,12 @@ osapi_volume_ext_list api osapi_volume_extension api osapi_volume_listen api osapi_volume_listen_port api +osapi_volume_workers api periodic_fuzzy_delay common periodic_interval common policy_default_rule common policy_file common publish_errors rpc -pybasedir common qpid_heartbeat rpc qpid_hostname rpc qpid_hosts rpc @@ -238,7 +246,6 @@ report_interval common reservation_expire quota reserved_percentage common restore_discard_excess_bytes backups_ceph -root_helper common rootwrap_config common rpc_backend rpc rpc_cast_timeout rpc @@ -280,7 +287,6 @@ sf_api_port solidfire sf_emulate_512 solidfire snapshot_name_template backups snapshot_same_host backups -sqlite_clean_db Unknown sqlite_db common sqlite_synchronous common ssh_conn_timeout san @@ -328,6 +334,7 @@ vmware_wsdl_location vmware volume_api_class api volume_backend_name storage volume_clear storage +volume_clear_ionice storage volume_clear_size storage volume_dd_blocksize storage volume_driver storage @@ -348,8 +355,6 @@ xenapi_nfs_serverpath storage_xen xenapi_sr_base_path storage_xen xiv_ds8k_connection_type xiv xiv_ds8k_proxy xiv -zadara_default_stripesize storage -zadara_default_striping_mode zadara zadara_password zadara zadara_user zadara zadara_vol_encrypt zadara @@ -361,6 +366,15 @@ zadara_vpsa_ip zadara 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 database/backend storage database/connection connection database/connection_debug connection @@ -372,6 +386,11 @@ 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/fc_fabric_names zoning +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/fixed_key keymgr matchmaker_redis/host common @@ -379,3 +398,6 @@ matchmaker_redis/password common matchmaker_redis/port common matchmaker_ring/ringfile rpc rpc_notifier2/topics common +ssl/ca_file ssl +ssl/cert_file ssl +ssl/key_file ssl