[config-ref] Update glance tables

Change-Id: I6fa692d536d4c19e75996e99276083cabfdb276c
Closes-Bug: #1532973
Closes-Bug: #1492363

doc/config-reference/source/tables/glance-amqp.rst

@@ -24,11 +24,13 @@
      - (StrOpt) Default publisher_id for outgoing notifications.
    * - ``disabled_notifications`` =
      - (ListOpt) List of disabled notifications. A notification can be given either as a notification type to disable a single event, or as a notification group prefix to disable all events within a group. Example: if this config option is set to ["image.create", "metadef_namespace"], then "image.create" notification will not be sent after image is created and none of the notifications for metadefinition namespaces will be sent.
-   * - ``notification_driver`` = ``[]``
-     - (MultiStrOpt) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing, log, test, noop
-   * - ``notification_topics`` = ``notifications``
-     - (ListOpt) AMQP topic used for OpenStack notifications.
-   * - ``notification_transport_url`` = ``None``
-     - (StrOpt) A URL representing the messaging driver to use for notifications. If not set, we fall back to the same configuration used for RPC.
    * - ``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.
+   * - **[oslo_messaging_notifications]**
+     -
+   * - ``driver`` = ``[]``
+     - (MultiStrOpt) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing, log, test, noop
+   * - ``topics`` = ``notifications``
+     - (ListOpt) AMQP topic used for OpenStack notifications.
+   * - ``transport_url`` = ``None``
+     - (StrOpt) A URL representing the messaging driver to use for notifications. If not set, we fall back to the same configuration used for RPC.

doc/config-reference/source/tables/glance-api.rst

@@ -67,7 +67,7 @@
    * - ``store_capabilities_update_min_interval`` = ``0``
      - (IntOpt) Minimum interval seconds to execute updating dynamic storage capabilities based on backend status then. It's not a periodic routine, the update logic will be executed only when interval seconds elapsed and an operation of store has triggered. The feature will be enabled only when the option value greater then zero.
    * - ``stores`` = ``file, http``
-     - (ListOpt) List of stores enabled
+     - (ListOpt) List of stores enabled. Valid stores are: cinder, file, http, rbd, sheepdog, swift, s3, vsphere
    * - **[oslo_middleware]**
      -
    * - ``max_request_body_size`` = ``114688``

doc/config-reference/source/tables/glance-auth_token.rst

@@ -30,14 +30,14 @@
      - (StrOpt) Prefix to prepend at the beginning of the path. Deprecated, use identity_uri.
    * - ``auth_host`` = ``127.0.0.1``
      - (StrOpt) Host providing the admin Identity API endpoint. Deprecated, use identity_uri.
-   * - ``auth_plugin`` = ``None``
-     - (StrOpt) Name of the plugin to load
    * - ``auth_port`` = ``35357``
      - (IntOpt) Port of the admin Identity API endpoint. Deprecated, use identity_uri.
    * - ``auth_protocol`` = ``https``
-     - (StrOpt) Protocol of the admin Identity API endpoint (http or https). Deprecated, use identity_uri.
+     - (StrOpt) Protocol of the admin Identity API endpoint. Deprecated, use identity_uri.
    * - ``auth_section`` = ``None``
-     - (StrOpt) Config Section from which to load plugin specific options
+     - (Opt) Config Section from which to load plugin specific options
+   * - ``auth_type`` = ``None``
+     - (Opt) Authentication type to load
    * - ``auth_uri`` = ``None``
      - (StrOpt) Complete public Identity API endpoint.
    * - ``auth_version`` = ``None``
@@ -81,7 +81,7 @@
    * - ``memcache_secret_key`` = ``None``
      - (StrOpt) (Optional, mandatory if memcache_security_strategy is defined) This string is used for key derivation.
    * - ``memcache_security_strategy`` = ``None``
-     - (StrOpt) (Optional) If defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization.
+     - (StrOpt) (Optional) If defined, indicate whether token data should be authenticated or authenticated and encrypted. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization.
    * - ``memcache_use_advanced_pool`` = ``False``
      - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x.
    * - ``region_name`` = ``None``

doc/config-reference/source/tables/glance-common.rst

@@ -58,7 +58,7 @@
      - (BoolOpt) Whether to include the backend image storage location in image properties. Revealing storage location can be a security risk, so use this setting with caution!
    * - ``user_storage_quota`` = ``0``
      - (StrOpt) Set a system wide quota for every user. This value is the total capacity that a user can use across all storage systems. A value of 0 means unlimited.Optional unit can be specified for the value. Accepted units are B, KB, MB, GB and TB representing Bytes, KiloBytes, MegaBytes, GigaBytes and TeraBytes respectively. If no unit is specified then Bytes is assumed. Note that there should not be any space between value and unit and units are case sensitive.
-   * - ``workers`` = ``1``
+   * - ``workers`` = ``4``
      - (IntOpt) The number of child process workers that will be created to service requests. The default will be equal to the number of CPUs available.
    * - **[glance_store]**
      -
@@ -66,7 +66,7 @@
      - (StrOpt) Region name of this node
    * - **[image_format]**
      -
-   * - ``container_formats`` = ``ami, ari, aki, bare, ovf, ova``
+   * - ``container_formats`` = ``ami, ari, aki, bare, ovf, ova, docker``
      - (ListOpt) Supported values for the 'container_format' image attribute
    * - ``disk_formats`` = ``ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso``
      - (ListOpt) Supported values for the 'disk_format' image attribute

doc/config-reference/source/tables/glance-filesystem.rst

@@ -18,7 +18,7 @@
      - Description
    * - **[glance_store]**
      -
-   * - ``filesystem_store_datadir`` = ``None``
+   * - ``filesystem_store_datadir`` = ``/var/lib/glance/images``
      - (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.

doc/config-reference/source/tables/glance-imagecache.rst

@@ -21,15 +21,15 @@
    * - ``delayed_delete`` = ``False``
      - (BoolOpt) Turn on/off delayed delete.
    * - ``image_cache_dir`` = ``None``
-     - (StrOpt) Base directory that the Image Cache uses.
+     - (StrOpt) Base directory that the image cache uses.
    * - ``image_cache_driver`` = ``sqlite``
      - (StrOpt) The driver to use for image cache management.
    * - ``image_cache_max_size`` = ``10737418240``
-     - (IntOpt) The upper limit (the maximum size of accumulated cache in bytes) beyond which pruner, if running, starts cleaning the images cache.
+     - (IntOpt) The upper limit (the maximum size of accumulated cache in bytes) beyond which the cache pruner, if running, starts cleaning the image cache.
    * - ``image_cache_sqlite_db`` = ``cache.db``
      - (StrOpt) The path to the sqlite file database that will be used for image cache management.
    * - ``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 incomplete image remain in the cache, before the cache cleaner, if running, will remove the incomplete image.
    * - ``scrub_pool_size`` = ``1``
      - (IntOpt) The size of thread pool to be used for scrubbing images. The default is one, which signifies serial scrubbing. Any value above one indicates the max number of images that may be scrubbed in parallel.
    * - ``scrub_time`` = ``0``

doc/config-reference/source/tables/glance-logging.rst

@@ -19,9 +19,9 @@
    * - **[DEFAULT]**
      -
    * - ``debug`` = ``False``
-     - (BoolOpt) Print debugging output (set logging level to DEBUG instead of default INFO level).
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN``
-     - (ListOpt) List of logger=LEVEL pairs. This option is ignored if log_config_append is set.
+     - (BoolOpt) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
+   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
+     - (ListOpt) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
    * - ``fatal_deprecations`` = ``False``
      - (BoolOpt) Enables or disables fatal status of deprecations.
    * - ``instance_format`` = ``"[instance: %(uuid)s] "``
@@ -29,25 +29,23 @@
    * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
      - (StrOpt) The format for an instance UUID that is passed with the log message.
    * - ``log_config_append`` = ``None``
-     - (StrOpt) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, log_format).
+     - (StrOpt) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
    * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
+     - (StrOpt) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
    * - ``log_dir`` = ``None``
-     - (StrOpt) (Optional) The base directory used for relative --log-file paths. This option is ignored if log_config_append is set.
+     - (StrOpt) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
    * - ``log_file`` = ``None``
-     - (StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. This option is ignored if log_config_append is set.
-   * - ``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. This option is ignored if log_config_append is set.
+     - (StrOpt) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
    * - ``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) Additional data to append to log message when logging level for the message 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 when context is undefined.
    * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
      - (StrOpt) Prefix each line of exception output with this format.
    * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (StrOpt) Format string for user_identity field of the logging_context_format_string
+     - (StrOpt) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
    * - ``publish_errors`` = ``False``
      - (BoolOpt) Enables or disables publication of error events.
    * - ``syslog_log_facility`` = ``LOG_USER``
@@ -57,8 +55,8 @@
    * - ``use_syslog`` = ``False``
      - (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
    * - ``use_syslog_rfc_format`` = ``True``
-     - (BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in Kilo, and will be removed in Mitaka, along with this option. This option is ignored if log_config_append is set.
+     - (BoolOpt) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). This option is ignored if log_config_append is set.
    * - ``verbose`` = ``True``
-     - (BoolOpt) If set to false, will disable INFO logging level, making WARNING the default.
+     - (BoolOpt) If set to false, the logging level will be set to WARNING instead of the default INFO level.
    * - ``watch_log_file`` = ``False``
-     - (BoolOpt) (Optional) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log-file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
+     - (BoolOpt) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.

doc/config-reference/source/tables/glance-profiler.rst

@@ -20,5 +20,7 @@
      -
    * - ``enabled`` = ``False``
      - (BoolOpt) If False fully disable profiling feature.
+   * - ``hmac_keys`` = ``SECRET_KEY``
+     - (StrOpt) Secret key to use to sign Glance API and Glance Registry services tracing messages.
    * - ``trace_sqlalchemy`` = ``False``
      - (BoolOpt) If False doesn't trace SQL requests.

doc/config-reference/source/tables/glance-rabbitmq.rst

@@ -28,10 +28,14 @@
      - (IntOpt) How often times during the heartbeat_timeout_threshold we check the heartbeat.
    * - ``heartbeat_timeout_threshold`` = ``60``
      - (IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL
+   * - ``kombu_compression`` = ``None``
+     - (StrOpt) EXPERIMENTAL: Possible values are: gzip, bz2. If not set compression will not be used. This option may notbe available in future versions.
+   * - ``kombu_failover_strategy`` = ``round-robin``
+     - (StrOpt) Determines how the next RabbitMQ node is chosen in case the one we are currently connected to becomes unavailable. Takes effect only if more than one RabbitMQ node is provided in config.
+   * - ``kombu_missing_consumer_retry_timeout`` = ``60``
+     - (IntOpt) How long to wait a missing client beforce abandoning to send it its replies. This value should not be longer than rpc_response_timeout.
    * - ``kombu_reconnect_delay`` = ``1.0``
      - (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification.
-   * - ``kombu_reconnect_timeout`` = ``60``
-     - (IntOpt) How long to wait before considering a reconnect attempt to have failed. This value should not be longer than rpc_response_timeout.
    * - ``kombu_ssl_ca_certs`` =
      - (StrOpt) SSL certification authority file (valid only if SSL enabled).
    * - ``kombu_ssl_certfile`` =
@@ -46,6 +50,8 @@
      - (StrOpt) The RabbitMQ broker address where a single node is used.
    * - ``rabbit_hosts`` = ``$rabbit_host:$rabbit_port``
      - (ListOpt) RabbitMQ HA cluster host:port pairs.
+   * - ``rabbit_interval_max`` = ``30``
+     - (IntOpt) Maximum interval of RabbitMQ connection retries. Default is 30 seconds.
    * - ``rabbit_login_method`` = ``AMQPLAIN``
      - (StrOpt) The RabbitMQ login method.
    * - ``rabbit_max_retries`` = ``0``
@@ -53,16 +59,18 @@
    * - ``rabbit_password`` = ``guest``
      - (StrOpt) The RabbitMQ password.
    * - ``rabbit_port`` = ``5672``
-     - (IntOpt) The RabbitMQ broker port where a single node is used.
+     - (PortOpt) The RabbitMQ broker port where a single node is used.
+   * - ``rabbit_qos_prefetch_count`` = ``0``
+     - (IntOpt) Specifies the number of messages to prefetch. Setting to zero allows unlimited messages.
    * - ``rabbit_retry_backoff`` = ``2``
      - (IntOpt) How long to backoff for between retries when connecting to RabbitMQ.
    * - ``rabbit_retry_interval`` = ``1``
      - (IntOpt) How frequently to retry connecting with RabbitMQ.
+   * - ``rabbit_transient_queues_ttl`` = ``600``
+     - (IntOpt) Positive integer representing duration in seconds for queue TTL (x-expires). Queues which are unused for the duration of the TTL are automatically deleted. The parameter affects only reply and fanout queues.
    * - ``rabbit_use_ssl`` = ``False``
      - (BoolOpt) Connect over SSL for RabbitMQ.
    * - ``rabbit_userid`` = ``guest``
      - (StrOpt) The RabbitMQ userid.
    * - ``rabbit_virtual_host`` = ``/``
      - (StrOpt) The RabbitMQ virtual host.
-   * - ``send_single_reply`` = ``False``
-     - (BoolOpt) Send a single AMQP reply to call message. The current behaviour since oslo-incubator is to send two AMQP replies - first one with the payload, a second one to ensure the other have finish to send the payload. We are going to remove it in the N release, but we must keep backward compatible at the same time. This option provides such compatibility - it defaults to False in Liberty and can be turned on for early adopters with a new installations or for testing. Please note, that this option will be removed in the Mitaka release.

doc/config-reference/source/tables/glance-redis.rst

@@ -16,19 +16,21 @@
 
    * - Configuration option = Default value
      - Description
-   * - **[DEFAULT]**
-     -
-   * - ``host`` = ``127.0.0.1``
-     - (StrOpt) Host to locate redis.
-   * - ``password`` =
-     - (StrOpt) Password for Redis server (optional).
-   * - ``port`` = ``6379``
-     - (IntOpt) Use this port to connect to redis host.
    * - **[matchmaker_redis]**
      -
+   * - ``check_timeout`` = ``20000``
+     - (IntOpt) Time in ms to wait before the transaction is killed.
    * - ``host`` = ``127.0.0.1``
      - (StrOpt) Host to locate redis.
    * - ``password`` =
      - (StrOpt) Password for Redis server (optional).
    * - ``port`` = ``6379``
-     - (IntOpt) Use this port to connect to redis host.
+     - (PortOpt) Use this port to connect to redis host.
+   * - ``sentinel_group_name`` = ``oslo-messaging-zeromq``
+     - (StrOpt) Redis replica set name.
+   * - ``sentinel_hosts`` =
+     - (ListOpt) List of Redis Sentinel hosts (fault tolerance mode) e.g. [host:port, host1:port ... ]
+   * - ``socket_timeout`` = ``1000``
+     - (IntOpt) Timeout in ms on blocking socket operations
+   * - ``wait_timeout`` = ``500``
+     - (IntOpt) Time in ms to wait between connection attempts.

doc/config-reference/source/tables/glance-rpc.rst

@@ -21,9 +21,9 @@
    * - ``allowed_rpc_exception_modules`` = ``glance.common.exception, builtins, exceptions``
      - (ListOpt) Modules of exceptions that are permitted to be recreated upon receiving exception data from an rpc call.
    * - ``rpc_backend`` = ``rabbit``
-     - (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq.
-   * - ``rpc_cast_timeout`` = ``30``
-     - (IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq.
+     - (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include amqp and zmq.
+   * - ``rpc_cast_timeout`` = ``-1``
+     - (IntOpt) Seconds to wait before a cast expires (TTL). The default value of -1 specifies an infinite linger period. The value of 0 specifies no linger period. Pending messages shall be discarded immediately when the socket is closed. Only supported by impl_zmq.
    * - ``rpc_conn_pool_size`` = ``30``
      - (IntOpt) Size of RPC connection pool.
    * - ``rpc_poll_timeout`` = ``1``

doc/config-reference/source/tables/glance-taskflow.rst

@@ -19,7 +19,7 @@
    * - **[taskflow_executor]**
      -
    * - ``conversion_format`` = ``None``
-     - (StrOpt) The format to which images will be automatically converted.
+     - (StrOpt) The format to which images will be automatically converted. When using the RBD backend, this should be set to 'raw'
    * - ``engine_mode`` = ``parallel``
      - (StrOpt) The mode in which the engine will run. Can be 'serial' or 'parallel'.
    * - ``max_workers`` = ``10``

doc/config-reference/source/tables/glance-vmware.rst

@@ -22,12 +22,8 @@
      - (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) DEPRECATED. 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". This option is deprecated in favor of vmware_datastores and will be removed in the Liberty release.
-   * - ``vmware_datastore_name`` = ``None``
-     - (StrOpt) DEPRECATED. Datastore associated with the datacenter. This option is deprecated in favor of vmware_datastores and will be removed in the Liberty release.
    * - ``vmware_datastores`` = ``None``
-     - (MultiStrOpt) A list of datastores where the image can be stored. This option may be specified multiple times for specifying multiple datastores. Either one of vmware_datastore_name or vmware_datastores is required. The datastore name should be specified after its datacenter path, seperated by ":". An optional weight may be given after the datastore name, seperated again by ":". Thus, the required format becomes <datacenter_path>:<datastore_name>:<optional_weight>. When adding an image, the datastore with highest weight will be selected, unless there is not enough free space available in cases where the image size is already known. If no weight is given, it is assumed to be zero and the directory will be considered for selection last. If multiple datastores have the same weight, then the one with the most free space available is selected.
+     - (MultiStrOpt) A list of datastores where the image can be stored. This option may be specified multiple times for specifying multiple datastores. The datastore name should be specified after its datacenter path, seperated by ":". An optional weight may be given after the datastore name, seperated again by ":". Thus, the required format becomes <datacenter_path>:<datastore_name>:<optional_weight>. When adding an image, the datastore with highest weight will be selected, unless there is not enough free space available in cases where the image size is already known. If no weight is given, it is assumed to be zero and the directory will be considered for selection last. If multiple datastores have the same weight, then the one with the most free space available is selected.
    * - ``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``

doc/config-reference/source/tables/glance-zeromq.rst

@@ -18,8 +18,6 @@
      - Description
    * - **[DEFAULT]**
      -
-   * - ``rpc_zmq_all_req_rep`` = ``True``
-     - (BoolOpt) Use REQ/REP pattern for all methods CALL/CAST/FANOUT.
    * - ``rpc_zmq_bind_address`` = ``*``
      - (StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address.
    * - ``rpc_zmq_bind_port_retries`` = ``100``
@@ -37,8 +35,10 @@
    * - ``rpc_zmq_max_port`` = ``65536``
      - (IntOpt) Maximal port number for random ports range.
    * - ``rpc_zmq_min_port`` = ``49152``
-     - (IntOpt) Minimal port number for random ports range.
+     - (PortOpt) Minimal port number for random ports range.
    * - ``rpc_zmq_topic_backlog`` = ``None``
      - (IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited.
-   * - ``zmq_use_broker`` = ``True``
-     - (BoolOpt) Shows whether zmq-messaging uses broker or not.
+   * - ``use_pub_sub`` = ``True``
+     - (BoolOpt) Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy.
+   * - ``zmq_target_expire`` = ``120``
+     - (IntOpt) Expiration timeout in seconds of a name service record about existing target ( < 0 means no timeout).

tools/autogenerate-config-flagmappings/glance.flagmappings

@@ -36,7 +36,6 @@ enable_v2_registry api
 enable_v3_api api
 executor_thread_pool_size common
 fatal_deprecations logging
-host redis
 http_keepalive api
 image_cache_dir imagecache
 image_cache_driver imagecache
@@ -58,7 +57,6 @@ log_config_append logging
 log_date_format logging
 log_dir logging
 log_file logging
-log_format logging
 logging_context_format_string logging
 logging_debug_format_suffix logging
 logging_default_format_string logging
@@ -71,12 +69,7 @@ memcached_servers common
 metadata_encryption_key common
 metadata_source_path common
 metaonly replicator
-notification_driver amqp
-notification_topics amqp
-notification_transport_url amqp
 owner_is_tenant api
-password redis
-port redis
 property_protection_file common
 property_protection_rule_format common
 public_endpoint api
@@ -96,7 +89,6 @@ rpc_cast_timeout rpc
 rpc_conn_pool_size rpc
 rpc_poll_timeout rpc
 rpc_response_timeout rpc
-rpc_zmq_all_req_rep zeromq
 rpc_zmq_bind_address zeromq
 rpc_zmq_bind_port_retries zeromq
 rpc_zmq_concurrency zeromq
@@ -121,6 +113,7 @@ syslog_log_facility logging
 tcp_keepidle api
 token replicator
 transport_url amqp
+use_pub_sub zeromq
 use_stderr logging
 use_syslog logging
 use_syslog_rfc_format logging
@@ -130,7 +123,7 @@ verbose logging
 wakeup_time scrubber
 watch_log_file logging
 workers common
-zmq_use_broker zeromq
+zmq_target_expire zeromq
 cors/allow_credentials cors
 cors/allow_headers cors
 cors/allow_methods cors
@@ -222,8 +215,6 @@ glance_store/swift_store_ssl_compression swift
 glance_store/swift_store_user swift
 glance_store/vmware_api_insecure vmware
 glance_store/vmware_api_retry_count vmware
-glance_store/vmware_datacenter_path vmware
-glance_store/vmware_datastore_name vmware
 glance_store/vmware_datastores vmware
 glance_store/vmware_server_host vmware
 glance_store/vmware_server_password vmware
@@ -238,10 +229,10 @@ keystone_authtoken/admin_token auth_token
 keystone_authtoken/admin_user auth_token
 keystone_authtoken/auth_admin_prefix auth_token
 keystone_authtoken/auth_host auth_token
-keystone_authtoken/auth_plugin auth_token
 keystone_authtoken/auth_port auth_token
 keystone_authtoken/auth_protocol auth_token
 keystone_authtoken/auth_section auth_token
+keystone_authtoken/auth_type auth_token
 keystone_authtoken/auth_uri auth_token
 keystone_authtoken/auth_version auth_token
 keystone_authtoken/cache auth_token
@@ -270,9 +261,14 @@ keystone_authtoken/region_name auth_token
 keystone_authtoken/revocation_cache_time auth_token
 keystone_authtoken/signing_dir auth_token
 keystone_authtoken/token_cache_time auth_token
+matchmaker_redis/check_timeout redis
 matchmaker_redis/host redis
 matchmaker_redis/password redis
 matchmaker_redis/port redis
+matchmaker_redis/sentinel_group_name redis
+matchmaker_redis/sentinel_hosts redis
+matchmaker_redis/socket_timeout redis
+matchmaker_redis/wait_timeout redis
 oslo_concurrency/disable_process_locking rpc
 oslo_concurrency/lock_path rpc
 oslo_messaging_amqp/allow_insecure_clients rpc
@@ -291,27 +287,18 @@ oslo_messaging_amqp/ssl_key_file rpc
 oslo_messaging_amqp/ssl_key_password rpc
 oslo_messaging_amqp/trace rpc
 oslo_messaging_amqp/username rpc
-oslo_messaging_qpid/amqp_auto_delete qpid
-oslo_messaging_qpid/amqp_durable_queues qpid
-oslo_messaging_qpid/qpid_heartbeat qpid
-oslo_messaging_qpid/qpid_hostname qpid
-oslo_messaging_qpid/qpid_hosts qpid
-oslo_messaging_qpid/qpid_password qpid
-oslo_messaging_qpid/qpid_port qpid
-oslo_messaging_qpid/qpid_protocol qpid
-oslo_messaging_qpid/qpid_receiver_capacity qpid
-oslo_messaging_qpid/qpid_sasl_mechanisms qpid
-oslo_messaging_qpid/qpid_tcp_nodelay qpid
-oslo_messaging_qpid/qpid_topology_version qpid
-oslo_messaging_qpid/qpid_username qpid
-oslo_messaging_qpid/send_single_reply qpid
+oslo_messaging_notifications/driver amqp
+oslo_messaging_notifications/topics amqp
+oslo_messaging_notifications/transport_url amqp
 oslo_messaging_rabbit/amqp_auto_delete rabbitmq
 oslo_messaging_rabbit/amqp_durable_queues rabbitmq
 oslo_messaging_rabbit/fake_rabbit rabbitmq
 oslo_messaging_rabbit/heartbeat_rate rabbitmq
 oslo_messaging_rabbit/heartbeat_timeout_threshold rabbitmq
+oslo_messaging_rabbit/kombu_compression rabbitmq
+oslo_messaging_rabbit/kombu_failover_strategy rabbitmq
+oslo_messaging_rabbit/kombu_missing_consumer_retry_timeout rabbitmq
 oslo_messaging_rabbit/kombu_reconnect_delay rabbitmq
-oslo_messaging_rabbit/kombu_reconnect_timeout rabbitmq
 oslo_messaging_rabbit/kombu_ssl_ca_certs rabbitmq
 oslo_messaging_rabbit/kombu_ssl_certfile rabbitmq
 oslo_messaging_rabbit/kombu_ssl_keyfile rabbitmq
@@ -319,16 +306,18 @@ oslo_messaging_rabbit/kombu_ssl_version rabbitmq
 oslo_messaging_rabbit/rabbit_ha_queues rabbitmq
 oslo_messaging_rabbit/rabbit_host rabbitmq
 oslo_messaging_rabbit/rabbit_hosts rabbitmq
+oslo_messaging_rabbit/rabbit_interval_max rabbitmq
 oslo_messaging_rabbit/rabbit_login_method rabbitmq
 oslo_messaging_rabbit/rabbit_max_retries rabbitmq
 oslo_messaging_rabbit/rabbit_password rabbitmq
 oslo_messaging_rabbit/rabbit_port rabbitmq
+oslo_messaging_rabbit/rabbit_qos_prefetch_count rabbitmq
 oslo_messaging_rabbit/rabbit_retry_backoff rabbitmq
 oslo_messaging_rabbit/rabbit_retry_interval rabbitmq
+oslo_messaging_rabbit/rabbit_transient_queues_ttl rabbitmq
 oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
 oslo_messaging_rabbit/rabbit_userid rabbitmq
 oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
-oslo_messaging_rabbit/send_single_reply rabbitmq
 oslo_middleware/max_request_body_size api
 oslo_middleware/secure_proxy_ssl_header api
 oslo_policy/policy_default_rule policy
@@ -337,6 +326,7 @@ oslo_policy/policy_file policy
 paste_deploy/config_file api
 paste_deploy/flavor api
 profiler/enabled profiler
+profiler/hmac_keys profiler
 profiler/trace_sqlalchemy profiler
 store_type_location_strategy/store_type_preference api
 task/task_executor common