diff --git a/doc/common/tables/glance-amqp.xml b/doc/common/tables/glance-amqp.xml
new file mode 100644
index 0000000000..8507ed5026
--- /dev/null
+++ b/doc/common/tables/glance-amqp.xml
@@ -0,0 +1,59 @@
+
+
+
+
+ Description of configuration options for amqp
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ amqp_auto_delete = False |
+ (BoolOpt) Auto-delete queues in amqp. |
+
+
+ amqp_durable_queues = False |
+ (BoolOpt) Use durable queues in amqp. |
+
+
+ notification_driver = [] |
+ (MultiStrOpt) Driver or drivers to handle sending notifications |
+
+
+ notification_topics = notifications |
+ (ListOpt) AMQP topic used for OpenStack notifications |
+
+
+ rpc_backend = rabbit |
+ (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
+
+
+ rpc_conn_pool_size = 30 |
+ (IntOpt) Size of RPC connection pool |
+
+
+ rpc_response_timeout = 60 |
+ (IntOpt) Seconds to wait for a response from a call |
+
+
+ rpc_thread_pool_size = 64 |
+ (IntOpt) Size of RPC greenthread pool |
+
+
+ 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/glance-api.xml b/doc/common/tables/glance-api.xml
index a5165ece0e..82b41f560c 100644
--- a/doc/common/tables/glance-api.xml
+++ b/doc/common/tables/glance-api.xml
@@ -28,7 +28,7 @@
default_publisher_id = image.localhost |
- (StrOpt) Default publisher_id for outgoing notifications |
+ (StrOpt) Default publisher_id for outgoing notifications. |
default_store = file |
@@ -47,9 +47,13 @@
(IntOpt) Maximum size of image a user can upload in bytes. Defaults to 1099511627776 bytes (1 TB). |
- known_stores = glance.store.filesystem.Store, glance.store.http.Store, glance.store.rbd.Store, glance.store.s3.Store, glance.store.swift.Store, glance.store.sheepdog.Store, glance.store.cinder.Store |
+ known_stores = glance.store.filesystem.Store, glance.store.http.Store, glance.store.rbd.Store, glance.store.s3.Store, glance.store.swift.Store, glance.store.sheepdog.Store, glance.store.cinder.Store, glance.store.vmware_datastore.Store |
(ListOpt) List of which store classes and store class locations are currently known to glance at startup. |
+
+ location_strategy = location_order |
+ (StrOpt) This value sets what strategy will be used to determine the image location order. Currently two strategies are packaged with Glance 'location_order' and 'store_type'. |
+
owner_is_tenant = True |
(BoolOpt) When true, this option sets the owner of an image to be the tenant. Otherwise, the owner of the image will be the authenticated user issuing the request. |
@@ -66,6 +70,13 @@
use_user_token = True |
(BoolOpt) Whether to pass through the user token when making requests to the registry. |
+
+ [store_type_location_strategy] |
+
+
+ store_type_preference = |
+ (ListOpt) The store names to use to get store preference order. The name must be registered by one of the stores defined by the 'known_stores' config option. This option will be applied when you using 'store_type' option as image location strategy defined by the 'location_strategy' config option. |
+
diff --git a/doc/common/tables/glance-cinder.xml b/doc/common/tables/glance-cinder.xml
index 6209ba71e6..7138fb83db 100644
--- a/doc/common/tables/glance-cinder.xml
+++ b/doc/common/tables/glance-cinder.xml
@@ -20,23 +20,23 @@
cinder_api_insecure = False |
- (BoolOpt) Allow to perform insecure SSL requests to cinder |
+ (BoolOpt) Allow to perform insecure SSL requests to cinder. |
cinder_ca_certificates_file = None |
- (StrOpt) Location of ca certicates file to use for cinder client requests. |
+ (StrOpt) Location of CA certicates file to use for cinder client requests. |
cinder_catalog_info = volume:cinder:publicURL |
- (StrOpt) Info to match when looking for cinder in the service catalog. Format is : separated values of the form: <service_type>:<service_name>:<endpoint_type> |
+ (StrOpt) Info to match when looking for cinder in the service catalog. Format is: separated values of the form: <service_type>:<service_name>:<endpoint_type>. |
cinder_endpoint_template = None |
- (StrOpt) Override service catalog lookup with template for cinder endpoint e.g. http://localhost:8776/v1/%(project_id)s |
+ (StrOpt) Override service catalog lookup with template for cinder endpoint e.g. http://localhost:8776/v1/%(project_id)s. |
cinder_http_retries = 3 |
- (IntOpt) Number of cinderclient retries on failed http calls |
+ (IntOpt) Number of cinderclient retries on failed http calls. |
diff --git a/doc/common/tables/glance-common.xml b/doc/common/tables/glance-common.xml
index 706a36afc3..043eb4a02b 100644
--- a/doc/common/tables/glance-common.xml
+++ b/doc/common/tables/glance-common.xml
@@ -80,7 +80,7 @@
os_region_name = None |
- (StrOpt) Region name of this node |
+ (StrOpt) Region name of this node. |
property_protection_file = None |
@@ -102,13 +102,6 @@
workers = 1 |
(IntOpt) The number of child process workers that will be created to service API requests. |
-
- [database] |
-
-
- use_tpool = False |
- (BoolOpt) Enable the experimental use of thread pooling for all DB API calls |
-
[image_format] |
diff --git a/doc/common/tables/glance-db.xml b/doc/common/tables/glance-db.xml
index 4aedbf3be5..3eb91f7838 100644
--- a/doc/common/tables/glance-db.xml
+++ b/doc/common/tables/glance-db.xml
@@ -15,17 +15,6 @@
-
- [DEFAULT] |
-
-
- sqlite_db = glance.sqlite |
- (StrOpt) the filename to use with sqlite |
-
-
- sqlite_synchronous = True |
- (BoolOpt) If true, use synchronous mode for sqlite |
-
[database] |
@@ -34,7 +23,7 @@
(StrOpt) The backend to use for db |
- connection = sqlite:////home/shaunm/Projects/glance/glance/openstack/common/db/$sqlite_db |
+ connection = None |
(StrOpt) The SQLAlchemy connection string used to connect to the database |
@@ -45,9 +34,25 @@
connection_trace = False |
(BoolOpt) Add python stack traces to SQL as comment strings |
+
+ db_inc_retry_interval = True |
+ (BoolOpt) Whether to increase interval between db connection retries, up to db_max_retry_interval |
+
+
+ db_max_retries = 20 |
+ (IntOpt) maximum db connection retries before error is raised. (setting -1 implies an infinite retry count) |
+
+
+ db_max_retry_interval = 10 |
+ (IntOpt) max seconds between db connection retries, if db_inc_retry_interval is enabled |
+
+
+ db_retry_interval = 1 |
+ (IntOpt) seconds between db connection retries |
+
idle_timeout = 3600 |
- (IntOpt) timeout before idle sql connections are reaped |
+ (IntOpt) Timeout before idle sql connections are reaped |
max_overflow = None |
@@ -59,23 +64,35 @@
max_retries = 10 |
- (IntOpt) maximum db connection retries during startup. (setting -1 implies an infinite retry count) |
+ (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 |
+
+ mysql_sql_mode = None |
+ (StrOpt) The SQL mode to be used for MySQL sessions (default is empty, meaning do not override any server-side SQL mode setting) |
+
pool_timeout = None |
(IntOpt) If set, use this value for pool_timeout with sqlalchemy |
retry_interval = 10 |
- (IntOpt) interval between retries of opening a sql connection |
+ (IntOpt) Interval between retries of opening a sql connection |
- slave_connection = |
- (StrOpt) The SQLAlchemy connection string used to connect to the slave database |
+ sqlite_db = glance.sqlite |
+ (StrOpt) The file name to use with SQLite |
+
+
+ sqlite_synchronous = True |
+ (BoolOpt) If True, SQLite uses synchronous mode |
+
+
+ use_db_reconnect = False |
+ (BoolOpt) Enable the experimental use of database reconnect on connection lost |
diff --git a/doc/common/tables/glance-filesystem.xml b/doc/common/tables/glance-filesystem.xml
index 94bb468058..bc04b03fc7 100644
--- a/doc/common/tables/glance-filesystem.xml
+++ b/doc/common/tables/glance-filesystem.xml
@@ -22,6 +22,10 @@
filesystem_store_datadir = None |
(StrOpt) Directory to which the Filesystem backend store writes images. |
+
+ filesystem_store_datadirs = None |
+ (MultiStrOpt) List of directories and its priorities to which the Filesystem backend store writes images. |
+
filesystem_store_metadata_file = None |
(StrOpt) The path to a file which contains the metadata to be returned with any location associated with this store. The file must contain a valid JSON dict. |
diff --git a/doc/common/tables/glance-gridfs.xml b/doc/common/tables/glance-gridfs.xml
index 9c225718c8..02d195a406 100644
--- a/doc/common/tables/glance-gridfs.xml
+++ b/doc/common/tables/glance-gridfs.xml
@@ -20,11 +20,11 @@
mongodb_store_db = None |
- (StrOpt) Database to use |
+ (StrOpt) Database to use. |
mongodb_store_uri = None |
- (StrOpt) Hostname or IP address of the instance to connect to, or a mongodb URI, or a list of hostnames / mongodb URIs. If host is an IPv6 literal it must be enclosed in '[' and ']' characters following the RFC2732 URL syntax (e.g. '[::1]' for localhost) |
+ (StrOpt) Hostname or IP address of the instance to connect to, or a mongodb URI, or a list of hostnames / mongodb URIs. If host is an IPv6 literal it must be enclosed in '[' and ']' characters following the RFC2732 URL syntax (e.g. '[::1]' for localhost). |
diff --git a/doc/common/tables/glance-imagecache.xml b/doc/common/tables/glance-imagecache.xml
index a07ad6d3c6..d9cb0d43b9 100644
--- a/doc/common/tables/glance-imagecache.xml
+++ b/doc/common/tables/glance-imagecache.xml
@@ -48,7 +48,7 @@
image_cache_stall_time = 86400 |
- (IntOpt) The amount of time to let an image remain in the cache without being accessed |
+ (IntOpt) The amount of time to let an image remain in the cache without being accessed. |
scrub_time = 0 |
@@ -56,7 +56,7 @@
scrubber_datadir = /var/lib/glance/scrubber |
- (StrOpt) Directory that the scrubber will use to track information about what to delete. Make sure this is set in glance-api.conf and glance-scrubber.conf |
+ (StrOpt) Directory that the scrubber will use to track information about what to delete. Make sure this is set in glance-api.conf and glance-scrubber.conf. |
diff --git a/doc/common/tables/glance-logging.xml b/doc/common/tables/glance-logging.xml
index c77ea69687..eab0b5b2ed 100644
--- a/doc/common/tables/glance-logging.xml
+++ b/doc/common/tables/glance-logging.xml
@@ -23,12 +23,12 @@
(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
- default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, keystone=INFO, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN |
- (ListOpt) list of logger=LEVEL pairs |
+ default_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 |
fatal_deprecations = False |
- (BoolOpt) make deprecations fatal |
+ (BoolOpt) Make deprecations fatal |
instance_format = "[instance: %(uuid)s] " |
@@ -59,32 +59,36 @@
(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 |
- (StrOpt) format string to use for log messages with context |
+ 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 |
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 |
publish_errors = False |
- (BoolOpt) publish error events |
+ (BoolOpt) Publish error events |
syslog-log-facility = LOG_USER |
- (StrOpt) syslog facility to receive log lines |
+ (StrOpt) Syslog facility to receive log lines |
use-syslog = False |
- (BoolOpt) Use syslog for logging. |
+ (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. |
use_stderr = True |
diff --git a/doc/common/tables/glance-matchmaker.xml b/doc/common/tables/glance-matchmaker.xml
new file mode 100644
index 0000000000..dfd8d9bf43
--- /dev/null
+++ b/doc/common/tables/glance-matchmaker.xml
@@ -0,0 +1,38 @@
+
+
+
+
+ Description of configuration options for matchmaker
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ matchmaker_heartbeat_freq = 300 |
+ (IntOpt) Heartbeat frequency |
+
+
+ matchmaker_heartbeat_ttl = 600 |
+ (IntOpt) Heartbeat time-to-live. |
+
+
+ [matchmaker_ring] |
+
+
+ ringfile = /etc/oslo/matchmaker_ring.json |
+ (StrOpt) Matchmaker ring file (JSON) |
+
+
+
+
diff --git a/doc/common/tables/glance-qpid.xml b/doc/common/tables/glance-qpid.xml
index 49acb07551..5b54d12b12 100644
--- a/doc/common/tables/glance-qpid.xml
+++ b/doc/common/tables/glance-qpid.xml
@@ -23,7 +23,7 @@
(IntOpt) Seconds between connection keepalive heartbeats |
- qpid_hostname = localhost |
+ qpid_hostname = oslo |
(StrOpt) Qpid broker hostname |
diff --git a/doc/common/tables/glance-rabbitmq.xml b/doc/common/tables/glance-rabbitmq.xml
index 64e9f25435..d2d0d3c6ce 100644
--- a/doc/common/tables/glance-rabbitmq.xml
+++ b/doc/common/tables/glance-rabbitmq.xml
@@ -18,6 +18,10 @@
[DEFAULT] |
+
+ control_exchange = openstack |
+ (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
+
fake_rabbit = False |
(BoolOpt) If passed, use a fake RabbitMQ provider |
@@ -40,10 +44,10 @@
rabbit_ha_queues = False |
- (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to wipe RabbitMQ database when changing this option. |
+ (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. |
- rabbit_host = localhost |
+ rabbit_host = oslo |
(StrOpt) The RabbitMQ broker address where a single node is used |
@@ -52,11 +56,11 @@
rabbit_max_retries = 0 |
- (IntOpt) maximum retries with trying to connect to RabbitMQ (the default of 0 implies an infinite retry count) |
+ (IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count) |
rabbit_password = guest |
- (StrOpt) the RabbitMQ password |
+ (StrOpt) The RabbitMQ password |
rabbit_port = 5672 |
@@ -64,23 +68,23 @@
rabbit_retry_backoff = 2 |
- (IntOpt) how long to backoff for between retries when connecting to RabbitMQ |
+ (IntOpt) How long to backoff for between retries when connecting to RabbitMQ |
rabbit_retry_interval = 1 |
- (IntOpt) how frequently to retry connecting with RabbitMQ |
+ (IntOpt) How frequently to retry connecting with RabbitMQ |
rabbit_use_ssl = False |
- (BoolOpt) connect over SSL for RabbitMQ |
+ (BoolOpt) Connect over SSL for RabbitMQ |
rabbit_userid = guest |
- (StrOpt) the RabbitMQ userid |
+ (StrOpt) The RabbitMQ userid |
rabbit_virtual_host = / |
- (StrOpt) the RabbitMQ virtual host |
+ (StrOpt) The RabbitMQ virtual host |
diff --git a/doc/common/tables/glance-rbd.xml b/doc/common/tables/glance-rbd.xml
index 454f72cdf0..778ae47ab1 100644
--- a/doc/common/tables/glance-rbd.xml
+++ b/doc/common/tables/glance-rbd.xml
@@ -20,7 +20,7 @@
rbd_store_ceph_conf = /etc/ceph/ceph.conf |
- (StrOpt) Ceph configuration file path. If <None>, librados will locate the default config. If using cephx authentication, this file should include a reference to the right keyring in a client.<USER> section |
+ (StrOpt) Ceph configuration file path. If <None>, librados will locate the default config. If using cephx authentication, this file should include a reference to the right keyring in a client.<USER> section. |
rbd_store_chunk_size = 8 |
@@ -32,7 +32,7 @@
rbd_store_user = None |
- (StrOpt) RADOS user to authenticate as (only applicable if using Cephx. If <None>, a default will be chosen based on the client. section in rbd_store_ceph_conf) |
+ (StrOpt) RADOS user to authenticate as (only applicable if using Cephx. If <None>, a default will be chosen based on the client. section in rbd_store_ceph_conf). |
diff --git a/doc/common/tables/glance-redis.xml b/doc/common/tables/glance-redis.xml
new file mode 100644
index 0000000000..0ca7dfef39
--- /dev/null
+++ b/doc/common/tables/glance-redis.xml
@@ -0,0 +1,35 @@
+
+
+
+
+ Description of configuration options for redis
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ 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. |
+
+
+
+
diff --git a/doc/common/tables/glance-rpc.xml b/doc/common/tables/glance-rpc.xml
index 65a9f9692f..1bc3983bf1 100644
--- a/doc/common/tables/glance-rpc.xml
+++ b/doc/common/tables/glance-rpc.xml
@@ -19,7 +19,7 @@
[DEFAULT] |
- allowed_rpc_exception_modules = openstack.common.exception, glance.common.exception, exceptions |
+ allowed_rpc_exception_modules = oslo.messaging.exceptions, nova.exception, cinder.exception, exceptions |
(ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call. |
diff --git a/doc/common/tables/glance-swift.xml b/doc/common/tables/glance-swift.xml
index 3391985cca..e80b51d3c3 100644
--- a/doc/common/tables/glance-swift.xml
+++ b/doc/common/tables/glance-swift.xml
@@ -36,7 +36,7 @@
swift_store_auth_version = 2 |
- (StrOpt) Version of the authentication service to use. Valid versions are 2 for keystone and 1 for swauth and rackspace |
+ (StrOpt) Version of the authentication service to use. Valid versions are 2 for keystone and 1 for swauth and rackspace. |
swift_store_container = glance |
@@ -60,7 +60,7 @@
swift_store_large_object_size = 5120 |
- (IntOpt) The size, in MB, that Glance will start chunking image files and do a large object manifest in Swift |
+ (IntOpt) The size, in MB, that Glance will start chunking image files and do a large object manifest in Swift. |
swift_store_multi_tenant = False |
@@ -70,6 +70,10 @@
swift_store_region = None |
(StrOpt) The region of the swift endpoint to be used for single tenant. This setting is only necessary if the tenant has multiple swift endpoints. |
+
+ swift_store_retry_get_count = 0 |
+ (IntOpt) The number of times a Swift download will be retried before the request fails. |
+
swift_store_service_type = object-store |
(StrOpt) A string giving the service type of the swift service to use. This setting is only used if swift_store_auth_version is 2. |
@@ -80,7 +84,7 @@
swift_store_user = None |
- (StrOpt) The user to authenticate against the Swift authentication service |
+ (StrOpt) The user to authenticate against the Swift authentication service. |
diff --git a/doc/common/tables/glance-vmware.xml b/doc/common/tables/glance-vmware.xml
new file mode 100644
index 0000000000..17b48a0f46
--- /dev/null
+++ b/doc/common/tables/glance-vmware.xml
@@ -0,0 +1,59 @@
+
+
+
+
+ Description of configuration options for vmware
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ vmware_api_insecure = False |
+ (BoolOpt) Allow to perform insecure SSL requests to ESX/VC. |
+
+
+ vmware_api_retry_count = 10 |
+ (IntOpt) Number of times VMware ESX/VC server API must be retried upon connection related issues. |
+
+
+ vmware_datacenter_path = ha-datacenter |
+ (StrOpt) Inventory path to a datacenter. If the vmware_server_host specified is an ESX/ESXi, the vmware_datacenter_path is optional. If specified, it should be "ha-datacenter". |
+
+
+ vmware_datastore_name = None |
+ (StrOpt) Datastore associated with the datacenter. |
+
+
+ vmware_server_host = None |
+ (StrOpt) ESX/ESXi or vCenter Server target system. The server value can be an IP address or a DNS name. |
+
+
+ vmware_server_password = None |
+ (StrOpt) Password for authenticating with VMware ESX/VC server. |
+
+
+ vmware_server_username = None |
+ (StrOpt) Username for authenticating with VMware ESX/VC server. |
+
+
+ vmware_store_image_dir = /openstack_glance |
+ (StrOpt) The name of the directory where the glance images will be stored in the VMware datastore. |
+
+
+ vmware_task_poll_interval = 5 |
+ (IntOpt) The interval used for polling remote tasks invoked on VMware ESX/VC server. |
+
+
+
+
diff --git a/tools/autogenerate-config-flagmappings/glance.flagmappings b/tools/autogenerate-config-flagmappings/glance.flagmappings
index 227bbb3320..6ea7c2ff9a 100644
--- a/tools/autogenerate-config-flagmappings/glance.flagmappings
+++ b/tools/autogenerate-config-flagmappings/glance.flagmappings
@@ -5,6 +5,8 @@ admin_user registry
allow_additional_image_properties common
allow_anonymous_access api
allowed_rpc_exception_modules rpc
+amqp_auto_delete amqp
+amqp_durable_queues amqp
api_limit_max common
auth_region registry
auth_strategy registry
@@ -22,6 +24,7 @@ cinder_endpoint_template cinder
cinder_http_retries cinder
cleanup_scrubber imagecache
cleanup_scrubber_time imagecache
+control_exchange rabbitmq
data_api common
debug logging
default_log_levels logging
@@ -35,7 +38,9 @@ eventlet_hub wsgi
fake_rabbit rabbitmq
fatal_deprecations logging
filesystem_store_datadir filesystem
+filesystem_store_datadirs filesystem
filesystem_store_metadata_file filesystem
+host redis
image_cache_dir imagecache
image_cache_driver imagecache
image_cache_max_size imagecache
@@ -55,6 +60,7 @@ kombu_ssl_certfile rabbitmq
kombu_ssl_keyfile rabbitmq
kombu_ssl_version rabbitmq
limit_param_default common
+location_strategy api
lock_path common
log-config-append logging
log-date-format logging
@@ -65,15 +71,21 @@ logging_context_format_string logging
logging_debug_format_suffix logging
logging_default_format_string logging
logging_exception_prefix logging
+matchmaker_heartbeat_freq matchmaker
+matchmaker_heartbeat_ttl matchmaker
max_header_line wsgi
metadata_encryption_key common
mongodb_store_db gridfs
mongodb_store_uri gridfs
+notification_driver amqp
+notification_topics amqp
notifier_strategy common
os_region_name common
owner_is_tenant api
+password redis
policy_default_rule policy
policy_file policy
+port redis
property_protection_file common
property_protection_rule_format common
publish_errors logging
@@ -112,7 +124,11 @@ registry_client_protocol registry
registry_client_timeout registry
registry_host registry
registry_port registry
+rpc_backend amqp
rpc_cast_timeout zmq
+rpc_conn_pool_size amqp
+rpc_response_timeout amqp
+rpc_thread_pool_size amqp
rpc_zmq_bind_address zmq
rpc_zmq_contexts zmq
rpc_zmq_host zmq
@@ -135,8 +151,6 @@ sheepdog_store_chunk_size sheepdog
sheepdog_store_port sheepdog
show_image_direct_url common
show_multiple_locations api
-sqlite_db db
-sqlite_synchronous db
swift_enable_snet swift
swift_store_admin_tenants swift
swift_store_auth_address swift
@@ -150,32 +164,52 @@ swift_store_large_object_chunk_size swift
swift_store_large_object_size swift
swift_store_multi_tenant swift
swift_store_region swift
+swift_store_retry_get_count swift
swift_store_service_type swift
swift_store_ssl_compression swift
swift_store_user swift
syslog-log-facility logging
tcp_keepidle wsgi
+transport_url amqp
use-syslog logging
+use-syslog-rfc-format logging
use_stderr logging
use_user_token api
user_storage_quota common
verbose logging
+vmware_api_insecure vmware
+vmware_api_retry_count vmware
+vmware_datacenter_path vmware
+vmware_datastore_name vmware
+vmware_server_host vmware
+vmware_server_password vmware
+vmware_server_username vmware
+vmware_store_image_dir vmware
+vmware_task_poll_interval vmware
workers common
database/backend db
database/connection db
database/connection_debug db
database/connection_trace db
+database/db_inc_retry_interval db
+database/db_max_retries db
+database/db_max_retry_interval db
+database/db_retry_interval db
database/idle_timeout db
database/max_overflow db
database/max_pool_size db
database/max_retries db
database/min_pool_size db
+database/mysql_sql_mode db
database/pool_timeout db
database/retry_interval db
-database/slave_connection db
-database/use_tpool common
+database/sqlite_db db
+database/sqlite_synchronous db
+database/use_db_reconnect db
image_format/container_formats common
image_format/disk_formats common
+matchmaker_ring/ringfile matchmaker
paste_deploy/config_file paste
paste_deploy/flavor paste
+store_type_location_strategy/store_type_preference api
task/task_time_to_live common