[config-ref] update trove config options for Newton

Change-Id: I94bdaef1c61cefeab6c9f2baaa7b9c15fbb2fd2f

doc/config-reference/source/database.rst

@@ -6,7 +6,6 @@ Database service
    :maxdepth: 1
 
    database/database.rst
-   database/rpc.rst
    database/logs.rst
    tables/conf-changes/trove.rst
 
@@ -34,5 +33,4 @@ configuration options.
 .. include:: tables/trove-swift.rst
 .. include:: tables/trove-taskmanager.rst
 .. include:: tables/trove-upgrades.rst
-.. include:: tables/trove-varmour.rst
 .. include:: tables/trove-volume.rst

doc/config-reference/source/database/rpc.rst

@@ -1,33 +0,0 @@
-==================================
-Configure the RPC messaging system
-==================================
-
-OpenStack projects use an open standard for messaging middleware known
-as AMQP. This messaging middleware enables the OpenStack services that
-run on multiple servers to talk to each other. OpenStack Trove RPC
-supports two implementations of AMQP: RabbitMQ and ZeroMQ.
-
-Configure RabbitMQ
-~~~~~~~~~~~~~~~~~~
-
-Use these options to configure the RabbitMQ messaging system
-in the ``trove.conf`` file:
-
-.. include:: ../tables/trove-rabbitmq.rst
-
-Configure ZeroMQ
-~~~~~~~~~~~~~~~~
-
-Use these options to configure the ZeroMQ messaging system
-in the ``trove.conf`` file:
-
-.. include:: ../tables/trove-zeromq.rst
-
-Configure messaging
-~~~~~~~~~~~~~~~~~~~
-
-Use these common options to configure the RabbitMQ and ZeroMq
-messaging drivers in the ``trove.conf`` file:
-
-.. include:: ../tables/trove-amqp.rst
-.. include:: ../tables/trove-rpc.rst

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

@@ -1,30 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _trove-amqp:
-
-.. list-table:: Description of AMQP configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``conductor_manager`` = ``trove.conductor.manager.Manager``
-     - (String) Qualified class name to use for conductor manager.
-   * - ``conductor_queue`` = ``trove-conductor``
-     - (String) Message queue name the Conductor will listen on.
-   * - ``control_exchange`` = ``openstack``
-     - (String) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option.
-   * - ``notification_service_id`` = ``{'mongodb': 'c8c907af-7375-456f-b929-b637ff9209ee', 'percona': 'fd1723f5-68d2-409c-994f-a4a197892a17', 'mysql': '2f3ff068-2bfb-4f70-9a9d-a6bb65bc084b', 'pxc': '75a628c3-f81b-4ffb-b10a-4087c26bc854', 'db2': 'e040cd37-263d-4869-aaa6-c62aa97523b5', 'cassandra': '459a230d-4e97-4344-9067-2a54a310b0ed', 'mariadb': '7a4f82cc-10d2-4bc6-aadc-d9aacc2a3cb5', 'postgresql': 'ac277e0d-4f21-40aa-b347-1ea31e571720', 'couchbase': 'fa62fe68-74d9-4779-a24e-36f19602c415', 'couchdb': 'f0a9ab7b-66f7-4352-93d7-071521d44c7c', 'redis': 'b216ffc5-1947-456c-a4cf-70f94c05f7d0', 'vertica': 'a8d805ae-a3b2-c4fd-gb23-b62cee5201ae'}``
-     - (Dict) Unique ID to tag notification events.
-   * - ``transport_url`` = ``None``
-     - (String) A URL representing the messaging driver to use and its full configuration.

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

@@ -33,7 +33,7 @@
    * - ``format_options`` = ``-m 5``
      - (String) Options to use when formatting a volume.
    * - ``host`` = ``0.0.0.0``
-     - (Unknown) Host to listen for RPC messages.
+     - (IP) Host to listen for RPC messages.
    * - ``module_aes_cbc_key`` = ``module_aes_cbc_key``
      - (String) OpenSSL aes_cbc key for module encryption.
    * - ``module_types`` = ``ping, new_relic_license``
@@ -42,12 +42,18 @@
      - (Integer) Page size for listing modules.
    * - ``network_label_regex`` = ``^private$``
      - (String) Regular expression to match Trove network labels.
+   * - ``notification_service_id`` = ``{'mongodb': 'c8c907af-7375-456f-b929-b637ff9209ee', 'percona': 'fd1723f5-68d2-409c-994f-a4a197892a17', 'mysql': '2f3ff068-2bfb-4f70-9a9d-a6bb65bc084b', 'pxc': '75a628c3-f81b-4ffb-b10a-4087c26bc854', 'db2': 'e040cd37-263d-4869-aaa6-c62aa97523b5', 'cassandra': '459a230d-4e97-4344-9067-2a54a310b0ed', 'mariadb': '7a4f82cc-10d2-4bc6-aadc-d9aacc2a3cb5', 'postgresql': 'ac277e0d-4f21-40aa-b347-1ea31e571720', 'couchbase': 'fa62fe68-74d9-4779-a24e-36f19602c415', 'couchdb': 'f0a9ab7b-66f7-4352-93d7-071521d44c7c', 'redis': 'b216ffc5-1947-456c-a4cf-70f94c05f7d0', 'vertica': 'a8d805ae-a3b2-c4fd-gb23-b62cee5201ae'}``
+     - (Dict) Unique ID to tag notification events.
+   * - ``num_tries`` = ``3``
+     - (Integer) Number of times to check if a volume exists.
    * - ``pybasedir`` = ``/usr/lib/python/site-packages/trove/trove``
      - (String) Directory where the Trove python module is installed.
    * - ``pydev_path`` = ``None``
      - (String) Set path to pydevd library, used if pydevd is not found in python sys.path.
    * - ``quota_notification_interval`` = ``3600``
      - (Integer) Seconds to wait between pushing events.
+   * - ``report_interval`` = ``30``
+     - (Integer) The interval (in seconds) which periodic tasks are run.
    * - ``sql_query_logging`` = ``False``
      - (Boolean) Allow insecure logging while executing queries through SQLAlchemy.
    * - ``taskmanager_queue`` = ``taskmanager``

doc/config-reference/source/tables/trove-db_couchdb.rst

@@ -10,7 +10,7 @@
 
 .. _trove-db_couchdb:
 
-.. list-table:: Description of db_couchdb configuration options
+.. list-table:: Description of CouchDB database configuration options
    :header-rows: 1
    :class: config-ref-table
 

doc/config-reference/source/tables/trove-db_db2.rst

@@ -22,7 +22,7 @@
      - (Dict) Incremental Backup Runner based on the default strategy. For strategies that do not implement an incremental, the runner will use the default full backup.
    * - ``backup_namespace`` = ``trove.guestagent.strategies.backup.experimental.db2_impl``
      - (String) Namespace to load backup strategies from.
-   * - ``backup_strategy`` = ``DB2Backup``
+   * - ``backup_strategy`` = ``DB2OfflineBackup``
      - (String) Default strategy to perform backups.
    * - ``default_password_length`` = ``36``
      - (Integer) Character length of generated passwords.

doc/config-reference/source/tables/trove-db_mariadb.rst

@@ -35,7 +35,7 @@
    * - ``guest_log_exposed_logs`` = ``general,slow_query``
      - (String) List of Guest Logs to expose for publishing.
    * - ``guest_log_long_query_time`` = ``1000``
-     - (Integer) The time in milliseconds that a statement must take in in order to be logged in the slow_query log.
+     - (Integer) DEPRECATED: The time in milliseconds that a statement must take in in order to be logged in the slow_query log. Will be replaced by a configuration group option: long_query_time
    * - ``guestagent_strategy`` = ``trove.common.strategies.cluster.experimental.galera_common.guestagent.GaleraCommonGuestAgentStrategy``
      - (String) Class that implements datastore-specific Guest Agent API logic.
    * - ``icmp`` = ``False``

doc/config-reference/source/tables/trove-db_mysql.rst

@@ -31,7 +31,7 @@
    * - ``guest_log_exposed_logs`` = ``general,slow_query``
      - (String) List of Guest Logs to expose for publishing.
    * - ``guest_log_long_query_time`` = ``1000``
-     - (Integer) The time in milliseconds that a statement must take in in order to be logged in the slow_query log.
+     - (Integer) DEPRECATED: The time in milliseconds that a statement must take in in order to be logged in the slow_query log. Will be replaced by a configuration group option: long_query_time
    * - ``icmp`` = ``False``
      - (Boolean) Whether to permit ICMP.
    * - ``ignore_dbs`` = ``mysql, information_schema, performance_schema``

doc/config-reference/source/tables/trove-db_percona.rst

@@ -31,7 +31,7 @@
    * - ``guest_log_exposed_logs`` = ``general,slow_query``
      - (String) List of Guest Logs to expose for publishing.
    * - ``guest_log_long_query_time`` = ``1000``
-     - (Integer) The time in milliseconds that a statement must take in in order to be logged in the slow_query log.
+     - (Integer) DEPRECATED: The time in milliseconds that a statement must take in in order to be logged in the slow_query log. Will be replaced by a configuration group option: long_query_time
    * - ``icmp`` = ``False``
      - (Boolean) Whether to permit ICMP.
    * - ``ignore_dbs`` = ``mysql, information_schema, performance_schema``

doc/config-reference/source/tables/trove-db_postgresql.rst

@@ -31,10 +31,10 @@
    * - ``guest_log_exposed_logs`` = ``general``
      - (String) List of Guest Logs to expose for publishing.
    * - ``guest_log_long_query_time`` = ``0``
-     - (Integer) The time in milliseconds that a statement must take in in order to be logged in the 'general' log. A value of '0' logs all statements, while '-1' turns off statement logging.
+     - (Integer) DEPRECATED: The time in milliseconds that a statement must take in in order to be logged in the 'general' log. A value of '0' logs all statements, while '-1' turns off statement logging. Will be replaced by configuration group option: log_min_duration_statement
    * - ``icmp`` = ``False``
      - (Boolean) Whether to permit ICMP.
-   * - ``ignore_dbs`` = ``postgres``
+   * - ``ignore_dbs`` = ``os_admin, postgres``
      - (List) No help text available for this option.
    * - ``ignore_users`` = ``os_admin, postgres, root``
      - (List) No help text available for this option.
@@ -42,6 +42,10 @@
      - (String) Filesystem path for mounting volumes if volume support is enabled.
    * - ``postgresql_port`` = ``5432``
      - (Port number) The TCP port the server listens on.
+   * - ``replication_namespace`` = ``trove.guestagent.strategies.replication.experimental.postgresql_impl``
+     - (String) Namespace to load replication strategies from.
+   * - ``replication_strategy`` = ``PostgresqlReplicationStreaming``
+     - (String) Default strategy for replication.
    * - ``restore_namespace`` = ``trove.guestagent.strategies.restore.experimental.postgresql_impl``
      - (String) Namespace to load restore strategies from.
    * - ``root_controller`` = ``trove.extensions.postgresql.service.PostgreSQLRootController``

doc/config-reference/source/tables/trove-db_pxc.rst

@@ -35,7 +35,7 @@
    * - ``guest_log_exposed_logs`` = ``general,slow_query``
      - (String) List of Guest Logs to expose for publishing.
    * - ``guest_log_long_query_time`` = ``1000``
-     - (Integer) The time in milliseconds that a statement must take in in order to be logged in the slow_query log.
+     - (Integer) DEPRECATED: The time in milliseconds that a statement must take in in order to be logged in the slow_query log. Will be replaced by a configuration group option: long_query_time
    * - ``guestagent_strategy`` = ``trove.common.strategies.cluster.experimental.galera_common.guestagent.GaleraCommonGuestAgentStrategy``
      - (String) Class that implements datastore-specific Guest Agent API logic.
    * - ``icmp`` = ``False``

doc/config-reference/source/tables/trove-dns.rst

@@ -31,11 +31,11 @@
    * - ``dns_endpoint_url`` = ``http://0.0.0.0``
      - (URI) Endpoint URL for DNSaaS.
    * - ``dns_hostname`` = ``localhost``
-     - (Unknown) Hostname used for adding DNS entries.
+     - (Hostname) Hostname used for adding DNS entries.
    * - ``dns_instance_entry_factory`` = ``trove.dns.driver.DnsInstanceEntryFactory``
      - (String) Factory for adding DNS entries.
    * - ``dns_management_base_url`` = ``http://0.0.0.0``
-     - (URL) Management URL for DNSaaS.
+     - (URI) Management URL for DNSaaS.
    * - ``dns_passkey`` =
      - (String) Passkey for DNSaaS.
    * - ``dns_region`` =

doc/config-reference/source/tables/trove-network.rst

@@ -25,4 +25,4 @@
    * - ``neutron_service_type`` = ``network``
      - (String) Service type to use when searching catalog.
    * - ``neutron_url`` = ``None``
-     - (Unknown) URL without the tenant segment.
+     - (URI) URL without the tenant segment.

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

@@ -1,132 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _trove-rabbitmq:
-
-.. list-table:: Description of RabbitMQ configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[oslo_messaging_rabbit]**
-     -
-   * - ``amqp_auto_delete`` = ``False``
-     - (Boolean) Auto-delete queues in AMQP.
-   * - ``amqp_durable_queues`` = ``False``
-     - (Boolean) Use durable queues in AMQP.
-   * - ``channel_max`` = ``None``
-     - (Integer) Maximum number of channels to allow
-   * - ``connection_factory`` = ``single``
-     - (String) Connection factory implementation
-   * - ``default_notification_exchange`` = ``${control_exchange}_notification``
-     - (String) Exchange name for sending notifications
-   * - ``default_notification_retry_attempts`` = ``-1``
-     - (Integer) Reconnecting retry count in case of connectivity problem during sending notification, -1 means infinite retry.
-   * - ``default_rpc_exchange`` = ``${control_exchange}_rpc``
-     - (String) Exchange name for sending RPC messages
-   * - ``default_rpc_retry_attempts`` = ``-1``
-     - (Integer) Reconnecting retry count in case of connectivity problem during sending RPC message, -1 means infinite retry. If actual retry attempts in not 0 the rpc request could be processed more then one time
-   * - ``fake_rabbit`` = ``False``
-     - (Boolean) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
-   * - ``frame_max`` = ``None``
-     - (Integer) The maximum byte size for an AMQP frame
-   * - ``heartbeat_interval`` = ``3``
-     - (Integer) How often to send heartbeats for consumer's connections
-   * - ``heartbeat_rate`` = ``2``
-     - (Integer) How often times during the heartbeat_timeout_threshold we check the heartbeat.
-   * - ``heartbeat_timeout_threshold`` = ``60``
-     - (Integer) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL
-   * - ``host_connection_reconnect_delay`` = ``0.25``
-     - (Floating point) Set delay for reconnection to some host which has connection error
-   * - ``kombu_compression`` = ``None``
-     - (String) EXPERIMENTAL: Possible values are: gzip, bz2. If not set compression will not be used. This option may not be available in future versions.
-   * - ``kombu_failover_strategy`` = ``round-robin``
-     - (String) 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``
-     - (Integer) How long to wait a missing client before abandoning to send it its replies. This value should not be longer than rpc_response_timeout.
-   * - ``kombu_reconnect_delay`` = ``1.0``
-     - (Floating point) How long to wait before reconnecting in response to an AMQP consumer cancel notification.
-   * - ``kombu_ssl_ca_certs`` =
-     - (String) SSL certification authority file (valid only if SSL enabled).
-   * - ``kombu_ssl_certfile`` =
-     - (String) SSL cert file (valid only if SSL enabled).
-   * - ``kombu_ssl_keyfile`` =
-     - (String) SSL key file (valid only if SSL enabled).
-   * - ``kombu_ssl_version`` =
-     - (String) SSL version to use (valid only if SSL enabled). Valid values are TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be available on some distributions.
-   * - ``notification_listener_prefetch_count`` = ``100``
-     - (Integer) Max number of not acknowledged message which RabbitMQ can send to notification listener.
-   * - ``notification_persistence`` = ``False``
-     - (Boolean) Persist notification messages.
-   * - ``notification_retry_delay`` = ``0.25``
-     - (Floating point) Reconnecting retry delay in case of connectivity problem during sending notification message
-   * - ``pool_max_overflow`` = ``0``
-     - (Integer) Maximum number of connections to create above `pool_max_size`.
-   * - ``pool_max_size`` = ``30``
-     - (Integer) Maximum number of connections to keep queued.
-   * - ``pool_recycle`` = ``600``
-     - (Integer) Lifetime of a connection (since creation) in seconds or None for no recycling. Expired connections are closed on acquire.
-   * - ``pool_stale`` = ``60``
-     - (Integer) Threshold at which inactive (since release) connections are considered stale in seconds or None for no staleness. Stale connections are closed on acquire.
-   * - ``pool_timeout`` = ``30``
-     - (Integer) Default number of seconds to wait for a connections to available
-   * - ``rabbit_ha_queues`` = ``False``
-     - (Boolean) Try to use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. In RabbitMQ 3.0, queue mirroring is no longer controlled by the x-ha-policy argument when declaring a queue. If you just want to make sure that all queues (except those with auto-generated names) are mirrored across all nodes, run: "rabbitmqctl set_policy HA '^(?!amq\.).*' '{"ha-mode": "all"}' "
-   * - ``rabbit_host`` = ``localhost``
-     - (String) DEPRECATED: The RabbitMQ broker address where a single node is used. Replaced by [DEFAULT]/transport_url
-   * - ``rabbit_hosts`` = ``$rabbit_host:$rabbit_port``
-     - (List) DEPRECATED: RabbitMQ HA cluster host:port pairs. Replaced by [DEFAULT]/transport_url
-   * - ``rabbit_interval_max`` = ``30``
-     - (Integer) Maximum interval of RabbitMQ connection retries. Default is 30 seconds.
-   * - ``rabbit_login_method`` = ``AMQPLAIN``
-     - (String) The RabbitMQ login method.
-   * - ``rabbit_max_retries`` = ``0``
-     - (Integer) DEPRECATED: Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).
-   * - ``rabbit_password`` = ``guest``
-     - (String) DEPRECATED: The RabbitMQ password. Replaced by [DEFAULT]/transport_url
-   * - ``rabbit_port`` = ``5672``
-     - (Port number) DEPRECATED: The RabbitMQ broker port where a single node is used. Replaced by [DEFAULT]/transport_url
-   * - ``rabbit_qos_prefetch_count`` = ``0``
-     - (Integer) Specifies the number of messages to prefetch. Setting to zero allows unlimited messages.
-   * - ``rabbit_retry_backoff`` = ``2``
-     - (Integer) How long to backoff for between retries when connecting to RabbitMQ.
-   * - ``rabbit_retry_interval`` = ``1``
-     - (Integer) How frequently to retry connecting with RabbitMQ.
-   * - ``rabbit_transient_queues_ttl`` = ``1800``
-     - (Integer) 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``
-     - (Boolean) Connect over SSL for RabbitMQ.
-   * - ``rabbit_userid`` = ``guest``
-     - (String) DEPRECATED: The RabbitMQ userid. Replaced by [DEFAULT]/transport_url
-   * - ``rabbit_virtual_host`` = ``/``
-     - (String) DEPRECATED: The RabbitMQ virtual host. Replaced by [DEFAULT]/transport_url
-   * - ``rpc_listener_prefetch_count`` = ``100``
-     - (Integer) Max number of not acknowledged message which RabbitMQ can send to rpc listener.
-   * - ``rpc_queue_expiration`` = ``60``
-     - (Integer) Time to live for rpc queues without consumers in seconds.
-   * - ``rpc_reply_exchange`` = ``${control_exchange}_rpc_reply``
-     - (String) Exchange name for receiving RPC replies
-   * - ``rpc_reply_listener_prefetch_count`` = ``100``
-     - (Integer) Max number of not acknowledged message which RabbitMQ can send to rpc reply listener.
-   * - ``rpc_reply_retry_attempts`` = ``-1``
-     - (Integer) Reconnecting retry count in case of connectivity problem during sending reply. -1 means infinite retry during rpc_timeout
-   * - ``rpc_reply_retry_delay`` = ``0.25``
-     - (Floating point) Reconnecting retry delay in case of connectivity problem during sending reply.
-   * - ``rpc_retry_delay`` = ``0.25``
-     - (Floating point) Reconnecting retry delay in case of connectivity problem during sending RPC message
-   * - ``socket_timeout`` = ``0.25``
-     - (Floating point) Set socket timeout in seconds for connection's socket
-   * - ``ssl`` = ``None``
-     - (Boolean) Enable SSL
-   * - ``ssl_options`` = ``None``
-     - (Dict) Arguments passed to ssl.wrap_socket
-   * - ``tcp_user_timeout`` = ``0.25``
-     - (Floating point) Set TCP_USER_TIMEOUT in seconds for connection's socket

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

@@ -1,118 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _trove-rpc:
-
-.. list-table:: Description of RPC configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``num_tries`` = ``3``
-     - (Integer) Number of times to check if a volume exists.
-   * - ``report_interval`` = ``30``
-     - (Integer) The interval (in seconds) which periodic tasks are run.
-   * - ``rpc_backend`` = ``rabbit``
-     - (String) DEPRECATED: The messaging driver to use, defaults to rabbit. Other drivers include amqp and zmq. Replaced by [DEFAULT]/transport_url
-   * - ``rpc_cast_timeout`` = ``-1``
-     - (Integer) 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``
-     - (Integer) Size of RPC connection pool.
-   * - ``rpc_poll_timeout`` = ``1``
-     - (Integer) The default number of seconds that poll should wait. Poll raises timeout exception when timeout expired.
-   * - ``rpc_response_timeout`` = ``60``
-     - (Integer) Seconds to wait for a response from a call.
-   * - **[oslo_concurrency]**
-     -
-   * - ``disable_process_locking`` = ``False``
-     - (Boolean) Enables or disables inter-process locks.
-   * - ``lock_path`` = ``None``
-     - (String) Directory to use for lock files. For security, the specified directory should only be writable by the user running the processes that need locking. Defaults to environment variable OSLO_LOCK_PATH. If external locks are used, a lock path must be set.
-   * - **[oslo_messaging_amqp]**
-     -
-   * - ``addressing_mode`` = ``dynamic``
-     - (String) Indicates the addressing mode used by the driver. Permitted values: 'legacy' - use legacy non-routable addressing 'routable' - use routable addresses 'dynamic' - use legacy addresses if the message bus does not support routing otherwise use routable addressing
-   * - ``allow_insecure_clients`` = ``False``
-     - (Boolean) Accept clients using either SSL or plain TCP
-   * - ``anycast_address`` = ``anycast``
-     - (String) Appended to the address prefix when sending to a group of consumers. Used by the message bus to identify messages that should be delivered in a round-robin fashion across consumers.
-   * - ``broadcast_prefix`` = ``broadcast``
-     - (String) address prefix used when broadcasting to all servers
-   * - ``connection_retry_backoff`` = ``2``
-     - (Integer) Increase the connection_retry_interval by this many seconds after each unsuccessful failover attempt.
-   * - ``connection_retry_interval`` = ``1``
-     - (Integer) Seconds to pause before attempting to re-connect.
-   * - ``connection_retry_interval_max`` = ``30``
-     - (Integer) Maximum limit for connection_retry_interval + connection_retry_backoff
-   * - ``container_name`` = ``None``
-     - (String) Name for the AMQP container. must be globally unique. Defaults to a generated UUID
-   * - ``default_notification_exchange`` = ``None``
-     - (String) Exchange name used in notification addresses. Exchange name resolution precedence: Target.exchange if set else default_notification_exchange if set else control_exchange if set else 'notify'
-   * - ``default_notify_timeout`` = ``30``
-     - (Integer) The deadline for a sent notification message delivery. Only used when caller does not provide a timeout expiry.
-   * - ``default_reply_timeout`` = ``30``
-     - (Integer) The deadline for an rpc reply message delivery. Only used when caller does not provide a timeout expiry.
-   * - ``default_rpc_exchange`` = ``None``
-     - (String) Exchange name used in RPC addresses. Exchange name resolution precedence: Target.exchange if set else default_rpc_exchange if set else control_exchange if set else 'rpc'
-   * - ``default_send_timeout`` = ``30``
-     - (Integer) The deadline for an rpc cast or call message delivery. Only used when caller does not provide a timeout expiry.
-   * - ``group_request_prefix`` = ``unicast``
-     - (String) address prefix when sending to any server in group
-   * - ``idle_timeout`` = ``0``
-     - (Integer) Timeout for inactive connections (in seconds)
-   * - ``link_retry_delay`` = ``10``
-     - (Integer) Time to pause between re-connecting an AMQP 1.0 link that failed due to a recoverable error.
-   * - ``multicast_address`` = ``multicast``
-     - (String) Appended to the address prefix when sending a fanout message. Used by the message bus to identify fanout messages.
-   * - ``notify_address_prefix`` = ``openstack.org/om/notify``
-     - (String) Address prefix for all generated Notification addresses
-   * - ``notify_server_credit`` = ``100``
-     - (Integer) Window size for incoming Notification messages
-   * - ``password`` =
-     - (String) Password for message broker authentication
-   * - ``reply_link_credit`` = ``200``
-     - (Integer) Window size for incoming RPC Reply messages.
-   * - ``rpc_address_prefix`` = ``openstack.org/om/rpc``
-     - (String) Address prefix for all generated RPC addresses
-   * - ``rpc_server_credit`` = ``100``
-     - (Integer) Window size for incoming RPC Request messages
-   * - ``sasl_config_dir`` =
-     - (String) Path to directory that contains the SASL configuration
-   * - ``sasl_config_name`` =
-     - (String) Name of configuration file (without .conf suffix)
-   * - ``sasl_mechanisms`` =
-     - (String) Space separated list of acceptable SASL mechanisms
-   * - ``server_request_prefix`` = ``exclusive``
-     - (String) address prefix used when sending to a specific server
-   * - ``ssl_ca_file`` =
-     - (String) CA certificate PEM file to verify server certificate
-   * - ``ssl_cert_file`` =
-     - (String) Identifying certificate PEM file to present to clients
-   * - ``ssl_key_file`` =
-     - (String) Private key PEM file used to sign cert_file certificate
-   * - ``ssl_key_password`` = ``None``
-     - (String) Password for decrypting ssl_key_file (if encrypted)
-   * - ``trace`` = ``False``
-     - (Boolean) Debug: dump AMQP frames to stdout
-   * - ``unicast_address`` = ``unicast``
-     - (String) Appended to the address prefix when sending to a particular RPC/Notification server. Used by the message bus to identify messages sent to a single destination.
-   * - ``username`` =
-     - (String) User name for message broker authentication
-   * - **[oslo_messaging_notifications]**
-     -
-   * - ``driver`` = ``[]``
-     - (Multi-valued) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing, log, test, noop
-   * - ``topics`` = ``notifications``
-     - (List) AMQP topic used for OpenStack notifications.
-   * - ``transport_url`` = ``None``
-     - (String) 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/trove-varmour.rst

@@ -1,28 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _trove-varmour:
-
-.. list-table:: Description of vArmour configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[vArmour]**
-     -
-   * - ``director`` = ``localhost``
-     - (String) vArmour director ip
-   * - ``director_port`` = ``443``
-     - (String) vArmour director port
-   * - ``password`` = ``varmour``
-     - (String) vArmour director password
-   * - ``username`` = ``varmour``
-     - (String) vArmour director username

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

@@ -1,84 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _trove-zeromq:
-
-.. list-table:: Description of ZeroMQ configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``rpc_zmq_bind_address`` = ``*``
-     - (String) 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``
-     - (Integer) Number of retries to find free port number before fail with ZMQBindError.
-   * - ``rpc_zmq_contexts`` = ``1``
-     - (Integer) Number of ZeroMQ contexts, defaults to 1.
-   * - ``rpc_zmq_host`` = ``localhost``
-     - (String) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova.
-   * - ``rpc_zmq_ipc_dir`` = ``/var/run/openstack``
-     - (String) Directory for holding IPC sockets.
-   * - ``rpc_zmq_matchmaker`` = ``redis``
-     - (String) MatchMaker driver.
-   * - ``rpc_zmq_max_port`` = ``65536``
-     - (Integer) Maximal port number for random ports range.
-   * - ``rpc_zmq_min_port`` = ``49153``
-     - (Port number) Minimal port number for random ports range.
-   * - ``rpc_zmq_serialization`` = ``json``
-     - (String) Default serialization mechanism for serializing/deserializing outgoing/incoming messages
-   * - ``rpc_zmq_topic_backlog`` = ``None``
-     - (Integer) Maximum number of ingress messages to locally buffer per topic. Default is unlimited.
-   * - ``use_pub_sub`` = ``True``
-     - (Boolean) Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy.
-   * - ``zmq_immediate`` = ``False``
-     - (Boolean) This option configures round-robin mode in zmq socket. True means not keeping a queue when server side disconnects. False means to keep queue and messages even if server is disconnected, when the server appears we send all accumulated messages to it.
-   * - ``zmq_target_expire`` = ``300``
-     - (Integer) Expiration timeout in seconds of a name service record about existing target ( < 0 means no timeout).
-   * - ``zmq_target_update`` = ``180``
-     - (Integer) Update period in seconds of a name service record about existing target.
-   * - **[oslo_messaging_zmq]**
-     -
-   * - ``rpc_cast_timeout`` = ``-1``
-     - (Integer) 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_poll_timeout`` = ``1``
-     - (Integer) The default number of seconds that poll should wait. Poll raises timeout exception when timeout expired.
-   * - ``rpc_zmq_bind_address`` = ``*``
-     - (String) 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``
-     - (Integer) Number of retries to find free port number before fail with ZMQBindError.
-   * - ``rpc_zmq_contexts`` = ``1``
-     - (Integer) Number of ZeroMQ contexts, defaults to 1.
-   * - ``rpc_zmq_host`` = ``localhost``
-     - (String) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova.
-   * - ``rpc_zmq_ipc_dir`` = ``/var/run/openstack``
-     - (String) Directory for holding IPC sockets.
-   * - ``rpc_zmq_matchmaker`` = ``redis``
-     - (String) MatchMaker driver.
-   * - ``rpc_zmq_max_port`` = ``65536``
-     - (Integer) Maximal port number for random ports range.
-   * - ``rpc_zmq_min_port`` = ``49153``
-     - (Port number) Minimal port number for random ports range.
-   * - ``rpc_zmq_serialization`` = ``json``
-     - (String) Default serialization mechanism for serializing/deserializing outgoing/incoming messages
-   * - ``rpc_zmq_topic_backlog`` = ``None``
-     - (Integer) Maximum number of ingress messages to locally buffer per topic. Default is unlimited.
-   * - ``use_pub_sub`` = ``True``
-     - (Boolean) Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy.
-   * - ``use_router_proxy`` = ``True``
-     - (Boolean) Use ROUTER remote proxy.
-   * - ``zmq_immediate`` = ``False``
-     - (Boolean) This option configures round-robin mode in zmq socket. True means not keeping a queue when server side disconnects. False means to keep queue and messages even if server is disconnected, when the server appears we send all accumulated messages to it.
-   * - ``zmq_target_expire`` = ``300``
-     - (Integer) Expiration timeout in seconds of a name service record about existing target ( < 0 means no timeout).
-   * - ``zmq_target_update`` = ``180``
-     - (Integer) Update period in seconds of a name service record about existing target.

tools/autogenerate-config-flagmappings/trove.flagmappings

@@ -28,12 +28,12 @@ cloudinit_location taskmanager
 cluster_delete_time_out cluster
 cluster_usage_timeout cluster
 clusters_page_size cluster
-conductor_manager amqp
+conductor_manager disable
-conductor_queue amqp
+conductor_queue disable
 configurations_page_size common
 conn_pool_min_size disable
 conn_pool_ttl disable
-control_exchange amqp
+control_exchange disable
 databases_page_size common
 datastore_manager taskmanager
 datastore_registry_ext taskmanager
@@ -109,7 +109,7 @@ network_label_regex common
 neutron_endpoint_type network
 neutron_service_type network
 neutron_url network
-notification_service_id amqp
+notification_service_id common
 nova_client_version compute
 nova_compute_endpoint_type compute
 nova_compute_service_type compute
@@ -118,7 +118,7 @@ nova_proxy_admin_pass nova
 nova_proxy_admin_tenant_id nova
 nova_proxy_admin_tenant_name nova
 nova_proxy_admin_user nova
-num_tries rpc
+num_tries common
 os_region_name api
 publish_errors disable
 pybasedir common
@@ -137,27 +137,27 @@ remote_heat_client clients
 remote_neutron_client clients
 remote_nova_client clients
 remote_swift_client clients
-report_interval rpc
+report_interval common
 resize_time_out taskmanager
 restore_usage_timeout taskmanager
 revert_time_out taskmanager
 root_grant compute
 root_grant_option compute
-rpc_backend rpc
+rpc_backend disable
-rpc_cast_timeout rpc
+rpc_cast_timeout disable
-rpc_conn_pool_size rpc
+rpc_conn_pool_size disable
-rpc_poll_timeout rpc
+rpc_poll_timeout disable
-rpc_response_timeout rpc
+rpc_response_timeout disable
-rpc_zmq_bind_address zeromq
+rpc_zmq_bind_address disable
-rpc_zmq_bind_port_retries zeromq
+rpc_zmq_bind_port_retries disable
-rpc_zmq_contexts zeromq
+rpc_zmq_contexts disable
-rpc_zmq_host zeromq
+rpc_zmq_host disable
-rpc_zmq_ipc_dir zeromq
+rpc_zmq_ipc_dir disable
-rpc_zmq_matchmaker zeromq
+rpc_zmq_matchmaker disable
-rpc_zmq_max_port zeromq
+rpc_zmq_max_port disable
-rpc_zmq_min_port zeromq
+rpc_zmq_min_port disable
-rpc_zmq_serialization zeromq
+rpc_zmq_serialization disable
-rpc_zmq_topic_backlog zeromq
+rpc_zmq_topic_backlog disable
 server_delete_time_out taskmanager
 sql_query_logging common
 state_change_poll_time taskmanager
@@ -172,7 +172,7 @@ taskmanager_queue common
 tcp_keepidle api
 template_path common
 timeout_wait_for_service common
-transport_url amqp
+transport_url disable
 trove_api_workers api
 trove_auth_url api
 trove_conductor_workers api
@@ -187,7 +187,7 @@ usage_timeout common
 use_heat taskmanager
 use_nova_server_config_drive taskmanager
 use_nova_server_volume taskmanager
-use_pub_sub zeromq
+use_pub_sub disable
 use_router_proxy disable
 use_stderr disable
 use_syslog disable
@@ -198,9 +198,9 @@ volume_format_timeout volume
 volume_fstype volume
 volume_time_out volume
 watch_log_file disable
-zmq_immediate zeromq
+zmq_immediate disable
-zmq_target_expire zeromq
+zmq_target_expire disable
-zmq_target_update zeromq
+zmq_target_update disable
 cassandra/api_strategy db_cassandra
 cassandra/backup_incremental_strategy db_cassandra
 cassandra/backup_namespace db_cassandra
@@ -420,118 +420,118 @@ mysql/tcp_ports db_mysql
 mysql/udp_ports db_mysql
 mysql/usage_timeout db_mysql
 mysql/volume_support db_mysql
-oslo_concurrency/disable_process_locking rpc
+oslo_concurrency/disable_process_locking disable
-oslo_concurrency/lock_path rpc
+oslo_concurrency/lock_path disable
-oslo_messaging_amqp/addressing_mode rpc
+oslo_messaging_amqp/addressing_mode disable
-oslo_messaging_amqp/allow_insecure_clients rpc
+oslo_messaging_amqp/allow_insecure_clients disable
-oslo_messaging_amqp/anycast_address rpc
+oslo_messaging_amqp/anycast_address disable
-oslo_messaging_amqp/broadcast_prefix rpc
+oslo_messaging_amqp/broadcast_prefix disable
-oslo_messaging_amqp/connection_retry_backoff rpc
+oslo_messaging_amqp/connection_retry_backoff disable
-oslo_messaging_amqp/connection_retry_interval rpc
+oslo_messaging_amqp/connection_retry_interval disable
-oslo_messaging_amqp/connection_retry_interval_max rpc
+oslo_messaging_amqp/connection_retry_interval_max disable
-oslo_messaging_amqp/container_name rpc
+oslo_messaging_amqp/container_name disable
-oslo_messaging_amqp/default_notification_exchange rpc
+oslo_messaging_amqp/default_notification_exchange disable
-oslo_messaging_amqp/default_notify_timeout rpc
+oslo_messaging_amqp/default_notify_timeout disable
-oslo_messaging_amqp/default_reply_timeout rpc
+oslo_messaging_amqp/default_reply_timeout disable
-oslo_messaging_amqp/default_rpc_exchange rpc
+oslo_messaging_amqp/default_rpc_exchange disable
-oslo_messaging_amqp/default_send_timeout rpc
+oslo_messaging_amqp/default_send_timeout disable
-oslo_messaging_amqp/group_request_prefix rpc
+oslo_messaging_amqp/group_request_prefix disable
-oslo_messaging_amqp/idle_timeout rpc
+oslo_messaging_amqp/idle_timeout disable
-oslo_messaging_amqp/link_retry_delay rpc
+oslo_messaging_amqp/link_retry_delay disable
-oslo_messaging_amqp/multicast_address rpc
+oslo_messaging_amqp/multicast_address disable
-oslo_messaging_amqp/notify_address_prefix rpc
+oslo_messaging_amqp/notify_address_prefix disable
-oslo_messaging_amqp/notify_server_credit rpc
+oslo_messaging_amqp/notify_server_credit disable
-oslo_messaging_amqp/password rpc
+oslo_messaging_amqp/password disable
-oslo_messaging_amqp/reply_link_credit rpc
+oslo_messaging_amqp/reply_link_credit disable
-oslo_messaging_amqp/rpc_address_prefix rpc
+oslo_messaging_amqp/rpc_address_prefix disable
-oslo_messaging_amqp/rpc_server_credit rpc
+oslo_messaging_amqp/rpc_server_credit disable
-oslo_messaging_amqp/sasl_config_dir rpc
+oslo_messaging_amqp/sasl_config_dir disable
-oslo_messaging_amqp/sasl_config_name rpc
+oslo_messaging_amqp/sasl_config_name disable
-oslo_messaging_amqp/sasl_mechanisms rpc
+oslo_messaging_amqp/sasl_mechanisms disable
-oslo_messaging_amqp/server_request_prefix rpc
+oslo_messaging_amqp/server_request_prefix disable
-oslo_messaging_amqp/ssl_ca_file rpc
+oslo_messaging_amqp/ssl_ca_file disable
-oslo_messaging_amqp/ssl_cert_file rpc
+oslo_messaging_amqp/ssl_cert_file disable
-oslo_messaging_amqp/ssl_key_file rpc
+oslo_messaging_amqp/ssl_key_file disable
-oslo_messaging_amqp/ssl_key_password rpc
+oslo_messaging_amqp/ssl_key_password disable
-oslo_messaging_amqp/trace rpc
+oslo_messaging_amqp/trace disable
-oslo_messaging_amqp/unicast_address rpc
+oslo_messaging_amqp/unicast_address disable
-oslo_messaging_amqp/username rpc
+oslo_messaging_amqp/username disable
-oslo_messaging_notifications/driver rpc
+oslo_messaging_notifications/driver disable
-oslo_messaging_notifications/topics rpc
+oslo_messaging_notifications/topics disable
-oslo_messaging_notifications/transport_url rpc
+oslo_messaging_notifications/transport_url disable
-oslo_messaging_rabbit/amqp_auto_delete rabbitmq
+oslo_messaging_rabbit/amqp_auto_delete disable
-oslo_messaging_rabbit/amqp_durable_queues rabbitmq
+oslo_messaging_rabbit/amqp_durable_queues disable
-oslo_messaging_rabbit/channel_max rabbitmq
+oslo_messaging_rabbit/channel_max disable
-oslo_messaging_rabbit/connection_factory rabbitmq
+oslo_messaging_rabbit/connection_factory disable
-oslo_messaging_rabbit/default_notification_exchange rabbitmq
+oslo_messaging_rabbit/default_notification_exchange disable
-oslo_messaging_rabbit/default_notification_retry_attempts rabbitmq
+oslo_messaging_rabbit/default_notification_retry_attempts disable
-oslo_messaging_rabbit/default_rpc_exchange rabbitmq
+oslo_messaging_rabbit/default_rpc_exchange disable
-oslo_messaging_rabbit/default_rpc_retry_attempts rabbitmq
+oslo_messaging_rabbit/default_rpc_retry_attempts disable
-oslo_messaging_rabbit/fake_rabbit rabbitmq
+oslo_messaging_rabbit/fake_rabbit disable
-oslo_messaging_rabbit/frame_max rabbitmq
+oslo_messaging_rabbit/frame_max disable
-oslo_messaging_rabbit/heartbeat_interval rabbitmq
+oslo_messaging_rabbit/heartbeat_interval disable
-oslo_messaging_rabbit/heartbeat_rate rabbitmq
+oslo_messaging_rabbit/heartbeat_rate disable
-oslo_messaging_rabbit/heartbeat_timeout_threshold rabbitmq
+oslo_messaging_rabbit/heartbeat_timeout_threshold disable
-oslo_messaging_rabbit/host_connection_reconnect_delay rabbitmq
+oslo_messaging_rabbit/host_connection_reconnect_delay disable
-oslo_messaging_rabbit/kombu_compression rabbitmq
+oslo_messaging_rabbit/kombu_compression disable
-oslo_messaging_rabbit/kombu_failover_strategy rabbitmq
+oslo_messaging_rabbit/kombu_failover_strategy disable
-oslo_messaging_rabbit/kombu_missing_consumer_retry_timeout rabbitmq
+oslo_messaging_rabbit/kombu_missing_consumer_retry_timeout disable
-oslo_messaging_rabbit/kombu_reconnect_delay rabbitmq
+oslo_messaging_rabbit/kombu_reconnect_delay disable
-oslo_messaging_rabbit/kombu_ssl_ca_certs rabbitmq
+oslo_messaging_rabbit/kombu_ssl_ca_certs disable
-oslo_messaging_rabbit/kombu_ssl_certfile rabbitmq
+oslo_messaging_rabbit/kombu_ssl_certfile disable
-oslo_messaging_rabbit/kombu_ssl_keyfile rabbitmq
+oslo_messaging_rabbit/kombu_ssl_keyfile disable
-oslo_messaging_rabbit/kombu_ssl_version rabbitmq
+oslo_messaging_rabbit/kombu_ssl_version disable
-oslo_messaging_rabbit/notification_listener_prefetch_count rabbitmq
+oslo_messaging_rabbit/notification_listener_prefetch_count disable
-oslo_messaging_rabbit/notification_persistence rabbitmq
+oslo_messaging_rabbit/notification_persistence disable
-oslo_messaging_rabbit/notification_retry_delay rabbitmq
+oslo_messaging_rabbit/notification_retry_delay disable
-oslo_messaging_rabbit/pool_max_overflow rabbitmq
+oslo_messaging_rabbit/pool_max_overflow disable
-oslo_messaging_rabbit/pool_max_size rabbitmq
+oslo_messaging_rabbit/pool_max_size disable
-oslo_messaging_rabbit/pool_recycle rabbitmq
+oslo_messaging_rabbit/pool_recycle disable
-oslo_messaging_rabbit/pool_stale rabbitmq
+oslo_messaging_rabbit/pool_stale disable
-oslo_messaging_rabbit/pool_timeout rabbitmq
+oslo_messaging_rabbit/pool_timeout disable
-oslo_messaging_rabbit/rabbit_ha_queues rabbitmq
+oslo_messaging_rabbit/rabbit_ha_queues disable
-oslo_messaging_rabbit/rabbit_host rabbitmq
+oslo_messaging_rabbit/rabbit_host disable
-oslo_messaging_rabbit/rabbit_hosts rabbitmq
+oslo_messaging_rabbit/rabbit_hosts disable
-oslo_messaging_rabbit/rabbit_interval_max rabbitmq
+oslo_messaging_rabbit/rabbit_interval_max disable
-oslo_messaging_rabbit/rabbit_login_method rabbitmq
+oslo_messaging_rabbit/rabbit_login_method disable
-oslo_messaging_rabbit/rabbit_max_retries rabbitmq
+oslo_messaging_rabbit/rabbit_max_retries disable
-oslo_messaging_rabbit/rabbit_password rabbitmq
+oslo_messaging_rabbit/rabbit_password disable
-oslo_messaging_rabbit/rabbit_port rabbitmq
+oslo_messaging_rabbit/rabbit_port disable
-oslo_messaging_rabbit/rabbit_qos_prefetch_count rabbitmq
+oslo_messaging_rabbit/rabbit_qos_prefetch_count disable
-oslo_messaging_rabbit/rabbit_retry_backoff rabbitmq
+oslo_messaging_rabbit/rabbit_retry_backoff disable
-oslo_messaging_rabbit/rabbit_retry_interval rabbitmq
+oslo_messaging_rabbit/rabbit_retry_interval disable
-oslo_messaging_rabbit/rabbit_transient_queues_ttl rabbitmq
+oslo_messaging_rabbit/rabbit_transient_queues_ttl disable
-oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
+oslo_messaging_rabbit/rabbit_use_ssl disable
-oslo_messaging_rabbit/rabbit_userid rabbitmq
+oslo_messaging_rabbit/rabbit_userid disable
-oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
+oslo_messaging_rabbit/rabbit_virtual_host disable
-oslo_messaging_rabbit/rpc_listener_prefetch_count rabbitmq
+oslo_messaging_rabbit/rpc_listener_prefetch_count disable
-oslo_messaging_rabbit/rpc_queue_expiration rabbitmq
+oslo_messaging_rabbit/rpc_queue_expiration disable
-oslo_messaging_rabbit/rpc_reply_exchange rabbitmq
+oslo_messaging_rabbit/rpc_reply_exchange disable
-oslo_messaging_rabbit/rpc_reply_listener_prefetch_count rabbitmq
+oslo_messaging_rabbit/rpc_reply_listener_prefetch_count disable
-oslo_messaging_rabbit/rpc_reply_retry_attempts rabbitmq
+oslo_messaging_rabbit/rpc_reply_retry_attempts disable
-oslo_messaging_rabbit/rpc_reply_retry_delay rabbitmq
+oslo_messaging_rabbit/rpc_reply_retry_delay disable
-oslo_messaging_rabbit/rpc_retry_delay rabbitmq
+oslo_messaging_rabbit/rpc_retry_delay disable
-oslo_messaging_rabbit/socket_timeout rabbitmq
+oslo_messaging_rabbit/socket_timeout disable
-oslo_messaging_rabbit/ssl rabbitmq
+oslo_messaging_rabbit/ssl disable
-oslo_messaging_rabbit/ssl_options rabbitmq
+oslo_messaging_rabbit/ssl_options disable
-oslo_messaging_rabbit/tcp_user_timeout rabbitmq
+oslo_messaging_rabbit/tcp_user_timeout disable
-oslo_messaging_zmq/rpc_cast_timeout zeromq
+oslo_messaging_zmq/rpc_cast_timeout disable
-oslo_messaging_zmq/rpc_poll_timeout zeromq
+oslo_messaging_zmq/rpc_poll_timeout disable
-oslo_messaging_zmq/rpc_zmq_bind_address zeromq
+oslo_messaging_zmq/rpc_zmq_bind_address disable
-oslo_messaging_zmq/rpc_zmq_bind_port_retries zeromq
+oslo_messaging_zmq/rpc_zmq_bind_port_retries disable
-oslo_messaging_zmq/rpc_zmq_contexts zeromq
+oslo_messaging_zmq/rpc_zmq_contexts disable
-oslo_messaging_zmq/rpc_zmq_host zeromq
+oslo_messaging_zmq/rpc_zmq_host disable
-oslo_messaging_zmq/rpc_zmq_ipc_dir zeromq
+oslo_messaging_zmq/rpc_zmq_ipc_dir disable
-oslo_messaging_zmq/rpc_zmq_matchmaker zeromq
+oslo_messaging_zmq/rpc_zmq_matchmaker disable
-oslo_messaging_zmq/rpc_zmq_max_port zeromq
+oslo_messaging_zmq/rpc_zmq_max_port disable
-oslo_messaging_zmq/rpc_zmq_min_port zeromq
+oslo_messaging_zmq/rpc_zmq_min_port disable
-oslo_messaging_zmq/rpc_zmq_serialization zeromq
+oslo_messaging_zmq/rpc_zmq_serialization disable
-oslo_messaging_zmq/rpc_zmq_topic_backlog zeromq
+oslo_messaging_zmq/rpc_zmq_topic_backlog disable
-oslo_messaging_zmq/use_pub_sub zeromq
+oslo_messaging_zmq/use_pub_sub disable
-oslo_messaging_zmq/use_router_proxy zeromq
+oslo_messaging_zmq/use_router_proxy disable
-oslo_messaging_zmq/zmq_immediate zeromq
+oslo_messaging_zmq/zmq_immediate disable
-oslo_messaging_zmq/zmq_target_expire zeromq
+oslo_messaging_zmq/zmq_target_expire disable
-oslo_messaging_zmq/zmq_target_update zeromq
+oslo_messaging_zmq/zmq_target_update disable
 oslo_middleware/enable_proxy_headers_parsing api
 oslo_middleware/max_request_body_size api
 oslo_middleware/secure_proxy_ssl_header api
@@ -569,6 +569,8 @@ postgresql/ignore_dbs db_postgresql
 postgresql/ignore_users db_postgresql
 postgresql/mount_point db_postgresql
 postgresql/postgresql_port db_postgresql
+postgresql/replication_namespace db_postgresql
+postgresql/replication_strategy db_postgresql
 postgresql/restore_namespace db_postgresql
 postgresql/root_controller db_postgresql
 postgresql/root_on_create db_postgresql

tools/autogenerate-config-flagmappings/trove.headers

@@ -2,6 +2,7 @@ backup backup
 cluster cluster
 db_cassandra Cassandra database
 db_couchbase Couchbase database
+db_couchdb CouchDB database
 db_db2 DB2 database
 db_mariadb MariaDB database
 db_mongodb MongoDB database