diff --git a/doc/common/tables/cinder-api.xml b/doc/common/tables/cinder-api.xml index e25fcff13f..b93b4ff85a 100644 --- a/doc/common/tables/cinder-api.xml +++ b/doc/common/tables/cinder-api.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + api_paste_config = api-paste.ini (StrOpt) File name for the paste.deploy config for cinder-api @@ -75,14 +78,6 @@ 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. - - \ No newline at end of file + diff --git a/doc/common/tables/cinder-auth.xml b/doc/common/tables/cinder-auth.xml index 679cbe0468..91d9909818 100644 --- a/doc/common/tables/cinder-auth.xml +++ b/doc/common/tables/cinder-auth.xml @@ -15,10 +15,13 @@ + + [DEFAULT] + auth_strategy = noauth (StrOpt) The strategy to use for auth. Supports noauth, keystone, and deprecated. - \ No newline at end of file + diff --git a/doc/common/tables/cinder-backups.xml b/doc/common/tables/cinder-backups.xml index 631a81ad50..6342af7e2a 100644 --- a/doc/common/tables/cinder-backups.xml +++ b/doc/common/tables/cinder-backups.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + backup_api_class = cinder.backup.api.API (StrOpt) The full class name of the volume backup API class @@ -49,4 +52,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-backups_ceph.xml b/doc/common/tables/cinder-backups_ceph.xml index 5c3baa0f3f..67037f59a6 100644 --- a/doc/common/tables/cinder-backups_ceph.xml +++ b/doc/common/tables/cinder-backups_ceph.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + backup_ceph_chunk_size = 134217728 (IntOpt) the chunk size in bytes that a backup will be broken into before transfer to backup store @@ -45,4 +48,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-backups_swift.xml b/doc/common/tables/cinder-backups_swift.xml index c52fd67643..0375192995 100644 --- a/doc/common/tables/cinder-backups_swift.xml +++ b/doc/common/tables/cinder-backups_swift.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + backup_swift_auth = per_user (StrOpt) Swift authentication mechanism @@ -49,4 +52,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-backups_tsm.xml b/doc/common/tables/cinder-backups_tsm.xml index 9f389f1b95..49db415276 100644 --- a/doc/common/tables/cinder-backups_tsm.xml +++ b/doc/common/tables/cinder-backups_tsm.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + backup_tsm_compression = True (BoolOpt) Enable or Disable compression for backups @@ -29,4 +32,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-block-device.xml b/doc/common/tables/cinder-block-device.xml index 1fc97ade5c..4fa9962eef 100644 --- a/doc/common/tables/cinder-block-device.xml +++ b/doc/common/tables/cinder-block-device.xml @@ -15,10 +15,13 @@ + + [DEFAULT] + available_devices = (ListOpt) List of all available devices - \ No newline at end of file + diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml index cbb58a46c2..1382e23639 100644 --- a/doc/common/tables/cinder-common.xml +++ b/doc/common/tables/cinder-common.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + compute_api_class = cinder.compute.nova.API (StrOpt) The full class name of the compute API class to use @@ -60,25 +63,9 @@ (BoolOpt) make exception message format errors fatal - host = docwork + host = oslo (StrOpt) Name of this node. This can be an opaque identifier. It is not necessarily a hostname, FQDN, or IP address. - - host = 127.0.0.1 - (StrOpt) Host to locate redis - - - host = docwork - (StrOpt) Name of this node. This can be an opaque identifier. It is not necessarily a hostname, FQDN, or IP address. - - - host = 127.0.0.1 - (StrOpt) Host to locate redis - - - idle_timeout = 3600 - (IntOpt) timeout before idle sql connections are reaped - iet_conf = /etc/iet/ietd.conf (StrOpt) IET configuration file @@ -92,23 +79,23 @@ (StrOpt) Directory to use for lock files. Default to a temp directory - log_config_append = None + log-config-append = None (StrOpt) The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging options. Please see the Python logging module documentation for details on logging configuration files. - log_date_format = %Y-%m-%d %H:%M:%S + log-date-format = %Y-%m-%d %H:%M:%S (StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s - log_dir = None + log-dir = None (StrOpt) (Optional) The base directory used for relative --log-file paths - log_file = None + log-file = None (StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. - log_format = None + log-format = None (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. @@ -136,7 +123,7 @@ (ListOpt) List of modules/decorators to monkey patch - my_ip = 192.168.0.8 + my_ip = 10.0.0.1 (StrOpt) ip address of this host @@ -147,10 +134,6 @@ num_shell_tries = 3 (IntOpt) number of times to attempt to run flakey shell commands - - password = None - (StrOpt) Password for Redis server. (optional) - periodic_fuzzy_delay = 60 (IntOpt) range of seconds to randomly delay when starting the periodic task scheduler to reduce stampeding. (Disable by setting to 0) @@ -168,11 +151,7 @@ (StrOpt) JSON file representing policy - port = 6379 - (IntOpt) Use this port to connect to redis host. - - - pybasedir = /usr/lib/python2.7/site-packages + pybasedir = /usr/lib/python/site-packages (StrOpt) Directory where the cinder python module is installed @@ -183,10 +162,6 @@ reserved_percentage = 0 (IntOpt) The percentage of backend capacity is reserved - - retry_interval = 10 - (IntOpt) interval between retries of opening a sql connection - root_helper = sudo (StrOpt) Deprecated: command to use for running commands as root @@ -232,21 +207,21 @@ (StrOpt) availability zone of this node - syslog_log_facility = LOG_USER + syslog-log-facility = LOG_USER (StrOpt) syslog facility to receive log lines tcp_keepidle = 600 (IntOpt) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X. - - topics = notifications - (ListOpt) AMQP topic(s) used for OpenStack notifications - until_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. @@ -256,16 +231,45 @@ (BoolOpt) Log output to standard error - use_syslog = False - (BoolOpt) Use syslog for logging. + verbose = False + (BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level). + + + [database] + + + idle_timeout = 3600 + (IntOpt) timeout before idle sql connections are reaped + + + retry_interval = 10 + (IntOpt) interval between retries of opening a sql connection use_tpool = False (BoolOpt) Enable the experimental use of thread pooling for all DB API calls - verbose = False - (BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level). + [matchmaker_redis] + + + host = 127.0.0.1 + (StrOpt) Host to locate redis + + + password = None + (StrOpt) Password for Redis server. (optional) + + + port = 6379 + (IntOpt) Use this port to connect to redis host. + + + [rpc_notifier2] + + + topics = notifications + (ListOpt) AMQP topic(s) used for OpenStack notifications diff --git a/doc/common/tables/cinder-compute.xml b/doc/common/tables/cinder-compute.xml index ed8fdb0298..e5e52a65d1 100644 --- a/doc/common/tables/cinder-compute.xml +++ b/doc/common/tables/cinder-compute.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + nova_api_insecure = False (BoolOpt) Allow to perform insecure SSL requests to nova @@ -45,4 +48,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-connection.xml b/doc/common/tables/cinder-connection.xml index be0b7baeb9..4ab388d794 100644 --- a/doc/common/tables/cinder-connection.xml +++ b/doc/common/tables/cinder-connection.xml @@ -15,6 +15,9 @@ + + [database] + connection = sqlite:///$state_path/$sqlite_db (StrOpt) The SQLAlchemy connection string used to connect to the database @@ -27,10 +30,6 @@ connection_trace = False (BoolOpt) Add python stack traces to SQL as comment strings - - connection_type = None - (StrOpt) Virtualization api connection type : libvirt, xenapi, or fake - - \ No newline at end of file + diff --git a/doc/common/tables/cinder-coraid.xml b/doc/common/tables/cinder-coraid.xml index b120387e7a..c2e1b1b02c 100644 --- a/doc/common/tables/cinder-coraid.xml +++ b/doc/common/tables/cinder-coraid.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + coraid_esm_address = (StrOpt) IP address of Coraid ESM @@ -37,4 +40,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-database.xml b/doc/common/tables/cinder-database.xml index 6c27719ba0..7cbcd070f1 100644 --- a/doc/common/tables/cinder-database.xml +++ b/doc/common/tables/cinder-database.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + db_backend = sqlalchemy (StrOpt) The backend to use for db @@ -25,4 +28,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-eqlx.xml b/doc/common/tables/cinder-eqlx.xml index 05352ce446..58030af814 100644 --- a/doc/common/tables/cinder-eqlx.xml +++ b/doc/common/tables/cinder-eqlx.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + eqlx_chap_login = admin (StrOpt) Existing CHAP account name @@ -45,4 +48,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-hds.xml b/doc/common/tables/cinder-hds.xml index 6f1e1696ae..c0bb271359 100644 --- a/doc/common/tables/cinder-hds.xml +++ b/doc/common/tables/cinder-hds.xml @@ -15,10 +15,13 @@ + + [DEFAULT] + hds_cinder_config_file = /opt/hds/hus/cinder_hus_conf.xml (StrOpt) configuration file for HDS cinder plugin for HUS - \ No newline at end of file + diff --git a/doc/common/tables/cinder-hp3par.xml b/doc/common/tables/cinder-hp3par.xml index 66bd6a85bb..5363aa3e38 100644 --- a/doc/common/tables/cinder-hp3par.xml +++ b/doc/common/tables/cinder-hp3par.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + hp3par_api_url = (StrOpt) 3PAR WSAPI Server Url like https://<3par ip>:8080/api/v1 @@ -31,10 +34,6 @@ hp3par_debug = False (BoolOpt) Enable HTTP debugging to 3PAR - - hp3par_domain = None - (StrOpt) This option is DEPRECATED and no longer used. The 3par domain name to use. - hp3par_iscsi_ips = (ListOpt) List of target iSCSI addresses to use. @@ -57,4 +56,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-huawei.xml b/doc/common/tables/cinder-huawei.xml index 665455eb99..a95c2dfe5f 100644 --- a/doc/common/tables/cinder-huawei.xml +++ b/doc/common/tables/cinder-huawei.xml @@ -15,10 +15,13 @@ + + [DEFAULT] + cinder_huawei_conf_file = /etc/cinder/cinder_huawei_conf.xml (StrOpt) config data for cinder huawei plugin - \ No newline at end of file + diff --git a/doc/common/tables/cinder-images.xml b/doc/common/tables/cinder-images.xml index becbea2a68..6a7ca8fa33 100644 --- a/doc/common/tables/cinder-images.xml +++ b/doc/common/tables/cinder-images.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + allowed_direct_url_schemes = (ListOpt) A list of url schemes that can be downloaded directly via the direct_url. Currently supported schemes: [file]. @@ -56,11 +59,11 @@ (StrOpt) Directory used for temporary storage during image conversion - instance_format = [instance: %(uuid)s] + instance_format = "[instance: %(uuid)s] " (StrOpt) If an instance is passed with the log message, format it like this - instance_uuid_format = [instance: %(uuid)s] + instance_uuid_format = "[instance: %(uuid)s] " (StrOpt) If an instance UUID is passed with the log message, format it like this @@ -69,4 +72,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-keymgr.xml b/doc/common/tables/cinder-keymgr.xml index 26d1d85911..4c9906b868 100644 --- a/doc/common/tables/cinder-keymgr.xml +++ b/doc/common/tables/cinder-keymgr.xml @@ -15,6 +15,9 @@ + + [keymgr] + api_class = cinder.keymgr.conf_key_mgr.ConfKeyManager (StrOpt) The full class name of the key manager API class @@ -25,4 +28,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-log.xml b/doc/common/tables/cinder-log.xml index f480a7674e..cec92288e1 100644 --- a/doc/common/tables/cinder-log.xml +++ b/doc/common/tables/cinder-log.xml @@ -15,10 +15,13 @@ + + [DEFAULT] + backlog = 4096 (IntOpt) Number of backlog requests to configure the socket with - \ No newline at end of file + diff --git a/doc/common/tables/cinder-lvm.xml b/doc/common/tables/cinder-lvm.xml index 612b8f1c9e..c42ab715ee 100644 --- a/doc/common/tables/cinder-lvm.xml +++ b/doc/common/tables/cinder-lvm.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + lvm_mirrors = 0 (IntOpt) If set, create lvms with multiple mirrors. Note that this requires lvm_mirrors + 2 pvs with available space @@ -29,4 +32,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-netapp_7mode_iscsi.xml b/doc/common/tables/cinder-netapp_7mode_iscsi.xml index 25fef744f9..89b7ae3553 100644 --- a/doc/common/tables/cinder-netapp_7mode_iscsi.xml +++ b/doc/common/tables/cinder-netapp_7mode_iscsi.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + netapp_login = None (StrOpt) Administrative user account name used to access the storage system. @@ -57,4 +60,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-netapp_7mode_nfs.xml b/doc/common/tables/cinder-netapp_7mode_nfs.xml index 679f6ef772..7a7fa6c9ed 100644 --- a/doc/common/tables/cinder-netapp_7mode_nfs.xml +++ b/doc/common/tables/cinder-netapp_7mode_nfs.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + expiry_thres_minutes = 720 (IntOpt) This option specifies the threshold for last access time for images in the NFS image cache. When a cache cleaning cycle begins, images in the cache that have not been accessed in the last M minutes, where M is the value of this parameter, will be deleted from the cache to create free space on the NFS share. @@ -57,4 +60,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-netapp_cdot_iscsi.xml b/doc/common/tables/cinder-netapp_cdot_iscsi.xml index 92d10895e8..2e14a5cfeb 100644 --- a/doc/common/tables/cinder-netapp_cdot_iscsi.xml +++ b/doc/common/tables/cinder-netapp_cdot_iscsi.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + netapp_login = None (StrOpt) Administrative user account name used to access the storage system. @@ -53,4 +56,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-netapp_cdot_nfs.xml b/doc/common/tables/cinder-netapp_cdot_nfs.xml index 45afcfe92d..8dac5eacc4 100644 --- a/doc/common/tables/cinder-netapp_cdot_nfs.xml +++ b/doc/common/tables/cinder-netapp_cdot_nfs.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + expiry_thres_minutes = 720 (IntOpt) This option specifies the threshold for last access time for images in the NFS image cache. When a cache cleaning cycle begins, images in the cache that have not been accessed in the last M minutes, where M is the value of this parameter, will be deleted from the cache to create free space on the NFS share. @@ -61,4 +64,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-nexenta_iscsi.xml b/doc/common/tables/cinder-nexenta_iscsi.xml index de10b268b4..4d6d3325c1 100644 --- a/doc/common/tables/cinder-nexenta_iscsi.xml +++ b/doc/common/tables/cinder-nexenta_iscsi.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + nexenta_blocksize = (StrOpt) block size for volumes (blank=default,8KB) @@ -77,4 +80,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-nexenta_nfs.xml b/doc/common/tables/cinder-nexenta_nfs.xml index 77b8a7971d..62e4204434 100644 --- a/doc/common/tables/cinder-nexenta_nfs.xml +++ b/doc/common/tables/cinder-nexenta_nfs.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + nexenta_mount_options = None (StrOpt) Mount options passed to the nfs client. See section of the nfs man page for details @@ -45,4 +48,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-nfs.xml b/doc/common/tables/cinder-nfs.xml deleted file mode 100644 index b29c989dd5..0000000000 --- a/doc/common/tables/cinder-nfs.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of configuration options for nfs
Configuration option = Default valueDescription
nfs_mount_options = None(StrOpt) Mount options passed to the nfs client. See section of the nfs man page for details.
nfs_mount_point_base = $state_path/mnt(StrOpt) Base dir containing mount points for nfs shares.
nfs_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.
nfs_shares_config = /etc/cinder/nfs_shares(StrOpt) File with the list of available nfs shares
nfs_sparsed_volumes = True(BoolOpt) Create volumes as sparsed files which take no space.If set to False volume is created as regular file.In such case volume creation takes a lot of time.
nfs_used_ratio = 0.95(FloatOpt) Percent of ACTUAL usage of the underlying volume before no new volumes can be allocated to the volume destination.
- \ No newline at end of file diff --git a/doc/common/tables/cinder-quota.xml b/doc/common/tables/cinder-quota.xml index 720583afd9..2bf7b5ed49 100644 --- a/doc/common/tables/cinder-quota.xml +++ b/doc/common/tables/cinder-quota.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + max_age = 0 (IntOpt) number of seconds between subsequent usage refreshes @@ -45,4 +48,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-rpc.xml b/doc/common/tables/cinder-rpc.xml index 6cdb841603..1a58c7db25 100644 --- a/doc/common/tables/cinder-rpc.xml +++ b/doc/common/tables/cinder-rpc.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + 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. @@ -163,10 +166,6 @@ rabbit_virtual_host = / (StrOpt) the RabbitMQ virtual host - - ringfile = /etc/oslo/matchmaker_ring.json - (StrOpt) Matchmaker ring file (JSON) - rpc_backend = cinder.openstack.common.rpc.impl_kombu (StrOpt) The messaging module to use, defaults to kombu. @@ -196,7 +195,7 @@ (IntOpt) Number of ZeroMQ contexts, defaults to 1 - rpc_zmq_host = docwork + rpc_zmq_host = oslo (StrOpt) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova. @@ -219,6 +218,13 @@ volume_topic = cinder-volume (StrOpt) the topic volume nodes listen on + + [matchmaker_ring] + + + ringfile = /etc/oslo/matchmaker_ring.json + (StrOpt) Matchmaker ring file (JSON) + diff --git a/doc/common/tables/cinder-san-solaris.xml b/doc/common/tables/cinder-san-solaris.xml index 780a4d3bef..92e2b968a3 100644 --- a/doc/common/tables/cinder-san-solaris.xml +++ b/doc/common/tables/cinder-san-solaris.xml @@ -15,10 +15,13 @@ + + [DEFAULT] + san_zfs_volume_base = rpool/ (StrOpt) The ZFS path under which to create zvols for volumes. - \ No newline at end of file + diff --git a/doc/common/tables/cinder-san.xml b/doc/common/tables/cinder-san.xml index 56cf523713..2f5e849ff6 100644 --- a/doc/common/tables/cinder-san.xml +++ b/doc/common/tables/cinder-san.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + san_clustername = (StrOpt) Cluster name to use for creating volumes @@ -61,4 +64,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-scality.xml b/doc/common/tables/cinder-scality.xml index db1921537f..6d401c978c 100644 --- a/doc/common/tables/cinder-scality.xml +++ b/doc/common/tables/cinder-scality.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + scality_sofs_config = None (StrOpt) Path or URL to Scality SOFS configuration file @@ -29,4 +32,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-scheduler.xml b/doc/common/tables/cinder-scheduler.xml index 137c8c279c..3462c46730 100644 --- a/doc/common/tables/cinder-scheduler.xml +++ b/doc/common/tables/cinder-scheduler.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + scheduler_default_filters = AvailabilityZoneFilter, CapacityFilter, CapabilitiesFilter (ListOpt) Which filter class names to use for filtering hosts when not specified in the request. @@ -49,4 +52,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-solidfire.xml b/doc/common/tables/cinder-solidfire.xml index c16d80c519..fafcfb6dbe 100644 --- a/doc/common/tables/cinder-solidfire.xml +++ b/doc/common/tables/cinder-solidfire.xml @@ -15,9 +15,12 @@ + + [DEFAULT] + sf_account_prefix = None - (StrOpt) Create SolidFire accounts with this prefix. Uses current hostname if unset (default). + (StrOpt) Create SolidFire accounts with this prefix. Any string can be used here, but the string "hostname" is special and will create a prefix using the cinder node hostsname (previous default behavior). The default is NO prefix. sf_allow_tenant_qos = False @@ -33,4 +36,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-storage.xml b/doc/common/tables/cinder-storage.xml index 17e2a906b2..9d04ac91cf 100644 --- a/doc/common/tables/cinder-storage.xml +++ b/doc/common/tables/cinder-storage.xml @@ -16,12 +16,11 @@ - allocated_capacity_weight_multiplier = -1.0 - (FloatOpt) Multiplier used for weighing volume capacity. Negative numbers mean to stack vs spread. + [DEFAULT] - backend = sqlalchemy - (StrOpt) The backend to use for db + allocated_capacity_weight_multiplier = -1.0 + (FloatOpt) Multiplier used for weighing volume capacity. Negative numbers mean to stack vs spread. bindir = $pybasedir/bin @@ -81,32 +80,12 @@ max_gigabytes = 10000 - (IntOpt) maximum number of volume gigabytes to allow per host - - - max_overflow = None - (IntOpt) If set, use this value for max_overflow with sqlalchemy - - - max_pool_size = 5 - (IntOpt) Maximum number of SQL connections to keep open in a pool - - - max_retries = 10 - (IntOpt) maximum db connection retries during startup. (setting -1 implies an infinite retry count) - - - memcached_servers = None - (ListOpt) Memcached servers or None for in process cache. + (IntOpt) This configure option has been deprecated along with the SimpleScheduler. New scheduler is able to gather capacity information for each host, thus setting the maximum number of volume gigabytes for host is no longer needed. It's safe to remove this configure from cinder.conf. migration_create_volume_timeout_secs = 300 (IntOpt) Timeout for creating the volume to migrate to when performing volume migration (seconds) - - min_pool_size = 1 - (IntOpt) Minimum number of SQL connections to keep open in a pool - num_iser_scan_tries = 3 (IntOpt) The maximum number of times to rescan iSER targetto find volume @@ -155,6 +134,29 @@ zadara_default_stripesize = 64 (StrOpt) Default stripe size for volumes + + [database] + + + backend = sqlalchemy + (StrOpt) The backend to use for db + + + max_overflow = None + (IntOpt) If set, use this value for max_overflow with sqlalchemy + + + max_pool_size = 5 + (IntOpt) Maximum number of SQL connections to keep open in a pool + + + max_retries = 10 + (IntOpt) maximum db connection retries during startup. (setting -1 implies an infinite retry count) + + + min_pool_size = 1 + (IntOpt) Minimum number of SQL connections to keep open in a pool + - \ No newline at end of file + diff --git a/doc/common/tables/cinder-storage_ceph.xml b/doc/common/tables/cinder-storage_ceph.xml index c4cc84b7e2..56b584298b 100644 --- a/doc/common/tables/cinder-storage_ceph.xml +++ b/doc/common/tables/cinder-storage_ceph.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + rbd_ceph_conf = (StrOpt) path to the ceph configuration file to use @@ -45,4 +48,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-storage_glusterfs.xml b/doc/common/tables/cinder-storage_glusterfs.xml index e4a14f7ff9..c0f200b291 100644 --- a/doc/common/tables/cinder-storage_glusterfs.xml +++ b/doc/common/tables/cinder-storage_glusterfs.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + glusterfs_mount_point_base = $state_path/mnt (StrOpt) Base dir containing mount points for gluster shares. @@ -33,4 +36,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-storage_gpfs.xml b/doc/common/tables/cinder-storage_gpfs.xml index 2fe6c64e6e..5069d5c059 100644 --- a/doc/common/tables/cinder-storage_gpfs.xml +++ b/doc/common/tables/cinder-storage_gpfs.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + gpfs_images_dir = None (StrOpt) Specifies the path of the Image service repository in GPFS. Leave undefined if not storing images in GPFS. @@ -37,4 +40,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-storage_nexenta_iscsi.xml b/doc/common/tables/cinder-storage_nexenta_iscsi.xml deleted file mode 100644 index 0184f8b186..0000000000 --- a/doc/common/tables/cinder-storage_nexenta_iscsi.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of configuration options for storage_nexenta_iscsi
Configuration option = Default valueDescription
nexenta_blocksize = (StrOpt) block size for volumes (blank=default,8KB)
nexenta_host = (StrOpt) IP address of Nexenta SA
nexenta_iscsi_target_portal_port = 3260(IntOpt) Nexenta target portal port
nexenta_password = nexenta(StrOpt) Password to connect to Nexenta SA
nexenta_rest_port = 2000(IntOpt) HTTP port to connect to Nexenta REST API server
nexenta_rest_protocol = auto(StrOpt) Use http or https for REST connection (default auto)
nexenta_sparse = False(BoolOpt) flag to create sparse volumes
nexenta_target_group_prefix = cinder/(StrOpt) prefix for iSCSI target groups on SA
nexenta_target_prefix = iqn.1986-03.com.sun:02:cinder-(StrOpt) IQN prefix for iSCSI targets
nexenta_user = admin(StrOpt) User name to connect to Nexenta SA
nexenta_volume = cinder(StrOpt) pool on SA that will hold all volumes
- \ No newline at end of file diff --git a/doc/common/tables/cinder-storage_nexenta_nfs.xml b/doc/common/tables/cinder-storage_nexenta_nfs.xml deleted file mode 100644 index 8589581616..0000000000 --- a/doc/common/tables/cinder-storage_nexenta_nfs.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of configuration options for storage_nexenta_nfs
Configuration option = Default valueDescription
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
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_sparsed_volumes = True(BoolOpt) Create volumes as sparsed files which take no space.If set to False volume is created as regular file.In such case volume creation takes a lot of time.
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.
- \ No newline at end of file diff --git a/doc/common/tables/cinder-storage_nfs.xml b/doc/common/tables/cinder-storage_nfs.xml index 0387170c9b..a2b9555f11 100644 --- a/doc/common/tables/cinder-storage_nfs.xml +++ b/doc/common/tables/cinder-storage_nfs.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + nfs_mount_options = None (StrOpt) Mount options passed to the nfs client. See section of the nfs man page for details. @@ -41,4 +44,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-storage_xen.xml b/doc/common/tables/cinder-storage_xen.xml index 9ba179e9db..be2ea1a2a0 100644 --- a/doc/common/tables/cinder-storage_xen.xml +++ b/doc/common/tables/cinder-storage_xen.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + xenapi_connection_password = None (StrOpt) Password for XenAPI connection @@ -41,4 +44,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-storwize.xml b/doc/common/tables/cinder-storwize.xml index 2de5f8fa0d..0f6af37c1e 100644 --- a/doc/common/tables/cinder-storwize.xml +++ b/doc/common/tables/cinder-storwize.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + storwize_svc_connection_protocol = iSCSI (StrOpt) Connection protocol (iSCSI/FC) @@ -69,4 +72,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-vmware.xml b/doc/common/tables/cinder-vmware.xml index 4f0bc6ad0e..ea642a72d4 100644 --- a/doc/common/tables/cinder-vmware.xml +++ b/doc/common/tables/cinder-vmware.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + vmware_api_retry_count = 10 (IntOpt) Number of times VMware ESX/VC server API must be retried upon connection related issues. @@ -53,4 +56,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-windows.xml b/doc/common/tables/cinder-windows.xml index c34511a071..8132aa55c7 100644 --- a/doc/common/tables/cinder-windows.xml +++ b/doc/common/tables/cinder-windows.xml @@ -15,10 +15,13 @@ + + [DEFAULT] + windows_iscsi_lun_path = C:\iSCSIVirtualDisks (StrOpt) Path to store VHD backed volumes - \ No newline at end of file + diff --git a/doc/common/tables/cinder-xiv.xml b/doc/common/tables/cinder-xiv.xml index a5f424c58f..4b51ba70c6 100644 --- a/doc/common/tables/cinder-xiv.xml +++ b/doc/common/tables/cinder-xiv.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + xiv_ds8k_connection_type = iscsi (StrOpt) Connection type to the IBM Storage Array (fibre_channel|iscsi) @@ -25,4 +28,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-zadara.xml b/doc/common/tables/cinder-zadara.xml index d881a5a460..7b1afcceea 100644 --- a/doc/common/tables/cinder-zadara.xml +++ b/doc/common/tables/cinder-zadara.xml @@ -15,6 +15,9 @@ + + [DEFAULT] + zadara_default_striping_mode = simple (StrOpt) Default striping mode for volumes @@ -65,4 +68,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/cinder-zones.xml b/doc/common/tables/cinder-zones.xml index cf51acb259..82e2e06aa9 100644 --- a/doc/common/tables/cinder-zones.xml +++ b/doc/common/tables/cinder-zones.xml @@ -15,10 +15,13 @@ + + [DEFAULT] + cloned_volume_same_az = True (BoolOpt) Ensure that the new volumes are the same AZ as snapshot or source volume - \ No newline at end of file + diff --git a/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml b/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml index 82de86a26c..1d669bfa35 100644 --- a/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml +++ b/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml @@ -48,7 +48,7 @@ This table contains the options supported by the Nexenta iSCSI driver. + href="../../../common/tables/cinder-nexenta_iscsi.xml"/> To use Compute with the Nexenta iSCSI driver, first set the volume_driver: volume_driver=cinder.volume.drivers.nexenta.iscsi.NexentaISCSIDriver @@ -91,7 +91,7 @@ volume_driver = cinder.volume.drivers.nexenta.nfs.NexentaNfsDriver The following table contains the options supported by the Nexenta NFS driver. + href="../../../common/tables/cinder-nexenta_nfs.xml"/> Add your list of Nexenta NFS servers to the file you specified with the nexenta_shares_config option. For example, if the value of this option was diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 60698a662e..f41f251426 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -4,13 +4,11 @@ allowed_rpc_exception_modules rpc amqp_auto_delete rpc amqp_durable_queues rpc amqp_rpc_single_reply_queue rpc -api_class keymgr api_paste_config api api_rate_limit api auth_strategy auth available_devices block-device backdoor_port api -backend storage backlog log backup_api_class backups backup_ceph_chunk_size backups_ceph @@ -40,10 +38,6 @@ capacity_weight_multiplier storage cinder_huawei_conf_file huawei cloned_volume_same_az zones compute_api_class common -connection connection -connection_debug connection -connection_trace connection -connection_type connection control_exchange rpc coraid_esm_address coraid coraid_group coraid @@ -72,9 +66,9 @@ 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 -fixed_key keymgr glance_api_insecure images glance_api_servers images glance_api_ssl_compression images @@ -94,7 +88,6 @@ gpfs_mount_point_base storage_gpfs gpfs_sparse_volumes storage_gpfs hds_cinder_config_file hds host common -host common hp3par_api_url hp3par hp3par_cpg hp3par hp3par_cpg_snap hp3par @@ -104,7 +97,6 @@ hp3par_password hp3par hp3par_snapshot_expiration hp3par hp3par_snapshot_retention hp3par hp3par_username hp3par -idle_timeout common iet_conf common image_conversion_dir images instance_format images @@ -115,7 +107,7 @@ iscsi_ip_address storage iscsi_num_targets storage iscsi_port storage iscsi_target_prefix storage -iser_helper storage +iser_helper storage iser_ip_address storage iser_num_targets storage iser_port storage @@ -126,11 +118,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 @@ -142,12 +134,7 @@ matchmaker_heartbeat_ttl rpc matchmaker_ringfile rpc max_age quota max_gigabytes storage -max_overflow storage -max_pool_size storage -max_retries storage -memcached_servers storage migration_create_volume_timeout_secs storage -min_pool_size storage monkey_patch common monkey_patch_modules common my_ip common @@ -210,12 +197,10 @@ osapi_volume_ext_list api osapi_volume_extension api osapi_volume_listen api osapi_volume_listen_port api -password common periodic_fuzzy_delay common periodic_interval common policy_default_rule common policy_file common -port common publish_errors rpc pybasedir common qpid_heartbeat rpc @@ -253,8 +238,6 @@ report_interval common reservation_expire quota reserved_percentage common restore_discard_excess_bytes backups_ceph -retry_interval common -ringfile rpc root_helper common rootwrap_config common rpc_backend rpc @@ -297,6 +280,7 @@ 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 @@ -320,19 +304,17 @@ 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 -topics common 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_tpool common verbose common vmware_api_retry_count vmware vmware_host_ip vmware @@ -355,8 +337,6 @@ 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 @@ -381,3 +361,21 @@ zadara_vpsa_ip zadara zadara_vpsa_poolname zadara zadara_vpsa_port zadara zadara_vpsa_use_ssl zadara +database/backend storage +database/connection connection +database/connection_debug connection +database/connection_trace connection +database/idle_timeout common +database/max_overflow storage +database/max_pool_size storage +database/max_retries storage +database/min_pool_size storage +database/retry_interval common +database/use_tpool common +keymgr/api_class keymgr +keymgr/fixed_key keymgr +matchmaker_redis/host common +matchmaker_redis/password common +matchmaker_redis/port common +matchmaker_ring/ringfile rpc +rpc_notifier2/topics common