diff --git a/doc/common/tables/trove-amqp.xml b/doc/common/tables/trove-amqp.xml index 95d247ff52..5d44fc5058 100644 --- a/doc/common/tables/trove-amqp.xml +++ b/doc/common/tables/trove-amqp.xml @@ -34,7 +34,7 @@ (MultiStrOpt) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing, log, test, noop - = {'vertica': 'a8d805ae-a3b2-c4fd-gb23-b62cee5201ae', 'db2': 'e040cd37-263d-4869-aaa6-c62aa97523b5', 'percona': 'fd1723f5-68d2-409c-994f-a4a197892a17', 'postgresql': 'ac277e0d-4f21-40aa-b347-1ea31e571720', 'mysql': '2f3ff068-2bfb-4f70-9a9d-a6bb65bc084b', 'couchbase': 'fa62fe68-74d9-4779-a24e-36f19602c415', 'mongodb': 'c8c907af-7375-456f-b929-b637ff9209ee', 'couchdb': 'f0a9ab7b-66f7-4352-93d7-071521d44c7c', 'redis': 'b216ffc5-1947-456c-a4cf-70f94c05f7d0', 'cassandra': '459a230d-4e97-4344-9067-2a54a310b0ed'} + = {'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'} (DictOpt) Unique ID to tag notification events. diff --git a/doc/common/tables/trove-auth_token.xml b/doc/common/tables/trove-auth_token.xml index 6639def25d..26abd5f236 100644 --- a/doc/common/tables/trove-auth_token.xml +++ b/doc/common/tables/trove-auth_token.xml @@ -149,6 +149,10 @@ = False (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + + = None + (StrOpt) The region in which the identity server can be found. + = 10 (IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. diff --git a/doc/common/tables/trove-cluster.xml b/doc/common/tables/trove-cluster.xml index 815bea9652..e5789804c0 100644 --- a/doc/common/tables/trove-cluster.xml +++ b/doc/common/tables/trove-cluster.xml @@ -22,7 +22,7 @@ (IntOpt) Maximum time (in seconds) to wait for a cluster delete. - = 675 + = 36000 (IntOpt) Maximum time (in seconds) to wait for a cluster to become active. diff --git a/doc/common/tables/trove-common.xml b/doc/common/tables/trove-common.xml index d2df1123e7..a9d4690a94 100644 --- a/doc/common/tables/trove-common.xml +++ b/doc/common/tables/trove-common.xml @@ -70,7 +70,11 @@ (StrOpt) Path which leads to datastore templates. - = 600 + = 120 + (IntOpt) Maximum time (in seconds) to wait for a service to become alive. + + + = 900 (IntOpt) Maximum time (in seconds) to wait for a Guest to become active. diff --git a/doc/common/tables/trove-db_couchbase.xml b/doc/common/tables/trove-db_couchbase.xml index 06a1404ca4..6ac42d9820 100644 --- a/doc/common/tables/trove-db_couchbase.xml +++ b/doc/common/tables/trove-db_couchbase.xml @@ -45,6 +45,10 @@ = trove.guestagent.strategies.restore.experimental.couchbase_impl (StrOpt) Namespace to load restore strategies from. + + = trove.extensions.common.service.DefaultRootController + (StrOpt) Root controller implementation for couchbase. + = True (BoolOpt) Enable the automatic creation of the root user for the service during instance-create. The generated password for the root user is immediately returned in the response of instance-create as the 'password' field. @@ -92,6 +96,10 @@ = None (StrOpt) Namespace to load restore strategies from. + + = trove.extensions.common.service.DefaultRootController + (StrOpt) Root controller implementation for couchdb. + = False (BoolOpt) Enable the automatic creation of the root user for the service during instance-create. The generated password for the root user is immediately returned in the response of instance-create as the "password" field. diff --git a/doc/common/tables/trove-db_db2.xml b/doc/common/tables/trove-db_db2.xml index 5a86b69e08..dfc9631093 100644 --- a/doc/common/tables/trove-db_db2.xml +++ b/doc/common/tables/trove-db_db2.xml @@ -49,6 +49,10 @@ = None (StrOpt) Namespace to load restore strategies from. + + = trove.extensions.common.service.DefaultRootController + (StrOpt) Root controller implementation for db2. + = False (BoolOpt) Enable the automatic creation of the root user for the service during instance-create. The generated password for the root user is immediately returned in the response of instance-create as the 'password' field. diff --git a/doc/common/tables/trove-db_mariadb.xml b/doc/common/tables/trove-db_mariadb.xml new file mode 100644 index 0000000000..bf38f7ed8e --- /dev/null +++ b/doc/common/tables/trove-db_mariadb.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of MariaDB database configuration options
Configuration option = Default valueDescription
[mariadb]
= {'InnoBackupEx': 'InnoBackupExIncremental'}(DictOpt) Incremental Backup Runner based on the default strategy. For strategies that do not implement an incremental backup, the runner will use the default full backup.
= trove.guestagent.strategies.backup.mysql_impl(StrOpt) Namespace to load backup strategies from.
= InnoBackupEx(StrOpt) Default strategy to perform backups.
= /dev/vdb(StrOpt) Device path for volume if volume support is enabled.
= /var/lib/mysql(StrOpt) Filesystem path for mounting volumes if volume support is enabled.
= trove.guestagent.strategies.replication.mysql_binlog(StrOpt) Namespace to load replication strategies from.
= MysqlBinlogReplication(StrOpt) Default strategy for replication.
= trove.guestagent.strategies.restore.mysql_impl(StrOpt) Namespace to load restore strategies from.
= trove.extensions.common.service.DefaultRootController(StrOpt) Root controller implementation for mysql.
= False(BoolOpt) Enable the automatic creation of the root user for the service during instance-create. The generated password for the root user is immediately returned in the response of instance-create as the 'password' field.
= 3306(ListOpt) List of TCP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).
= (ListOpt) List of UDP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).
= 400(IntOpt) Maximum time (in seconds) to wait for a Guest to become active.
= True(BoolOpt) Whether to provision a Cinder volume for datadir.
+ diff --git a/doc/common/tables/trove-db_mongodb.xml b/doc/common/tables/trove-db_mongodb.xml index b420ae34cf..4f05b0d168 100644 --- a/doc/common/tables/trove-db_mongodb.xml +++ b/doc/common/tables/trove-db_mongodb.xml @@ -17,6 +17,10 @@ [mongodb] + + = 300 + (IntOpt) Maximum time to wait (in seconds) for a replica set initialization process to complete. + = trove.common.strategies.cluster.experimental.mongodb.api.MongoDbAPIStrategy (StrOpt) Class that implements datastore-specific API logic. @@ -81,6 +85,10 @@ = trove.guestagent.strategies.restore.experimental.mongo_impl (StrOpt) Namespace to load restore strategies from. + + = trove.extensions.common.service.DefaultRootController + (StrOpt) Root controller implementation for mongodb. + = trove.common.strategies.cluster.experimental.mongodb.taskmanager.MongoDbTaskManagerStrategy (StrOpt) Class that implements datastore-specific task manager logic. @@ -91,7 +99,7 @@ = - (ListOpt) List of UPD ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True). + (ListOpt) List of UDP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True). = True diff --git a/doc/common/tables/trove-db_mysql.xml b/doc/common/tables/trove-db_mysql.xml index 2841b9d95f..cf8ec0fa8b 100644 --- a/doc/common/tables/trove-db_mysql.xml +++ b/doc/common/tables/trove-db_mysql.xml @@ -49,6 +49,10 @@ = trove.guestagent.strategies.restore.mysql_impl (StrOpt) Namespace to load restore strategies from. + + = trove.extensions.common.service.DefaultRootController + (StrOpt) Root controller implementation for mysql. + = False (BoolOpt) Enable the automatic creation of the root user for the service during instance-create. The generated password for the root user is immediately returned in the response of instance-create as the 'password' field. diff --git a/doc/common/tables/trove-db_percona.xml b/doc/common/tables/trove-db_percona.xml index f755c7601c..b4329f9a7b 100644 --- a/doc/common/tables/trove-db_percona.xml +++ b/doc/common/tables/trove-db_percona.xml @@ -57,6 +57,10 @@ = trove.guestagent.strategies.restore.mysql_impl (StrOpt) Namespace to load restore strategies from. + + = trove.extensions.common.service.DefaultRootController + (StrOpt) Root controller implementation for percona. + = False (BoolOpt) Enable the automatic creation of the root user for the service during instance-create. The generated password for the root user is immediately returned in the response of instance-create as the 'password' field. diff --git a/doc/common/tables/trove-db_postgresql.xml b/doc/common/tables/trove-db_postgresql.xml index 220aa87274..bb39336976 100644 --- a/doc/common/tables/trove-db_postgresql.xml +++ b/doc/common/tables/trove-db_postgresql.xml @@ -49,6 +49,10 @@ = trove.guestagent.strategies.restore.experimental.postgresql_impl (StrOpt) Namespace to load restore strategies from. + + = trove.extensions.common.service.DefaultRootController + (StrOpt) Root controller implementation for postgresql. + = False (BoolOpt) Enable the automatic creation of the root user for the service during instance-create. The generated password for the root user is immediately returned in the response of instance-create as the 'password' field. @@ -59,7 +63,7 @@ = - (ListOpt) List of UPD ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True). + (ListOpt) List of UDP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True). = True diff --git a/doc/common/tables/trove-db_pxc.xml b/doc/common/tables/trove-db_pxc.xml new file mode 100644 index 0000000000..2c37db9edc --- /dev/null +++ b/doc/common/tables/trove-db_pxc.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of Percona XtraDB Cluster database configuration options
Configuration option = Default valueDescription
[pxc]
= trove.common.strategies.cluster.experimental.pxc.api.PXCAPIStrategy(StrOpt) Class that implements datastore-specific API logic.
= {'InnoBackupEx': 'InnoBackupExIncremental'}(DictOpt) Incremental Backup Runner based on the default strategy. For strategies that do not implement an incremental backup, the runner will use the default full backup.
= trove.guestagent.strategies.backup.mysql_impl(StrOpt) Namespace to load backup strategies from.
= InnoBackupEx(StrOpt) Default strategy to perform backups.
= True(BoolOpt) Enable clusters to be created and managed.
= /dev/vdb(StrOpt) Device path for volume if volume support is enabled.
= trove.common.strategies.cluster.experimental.pxc.guestagent.PXCGuestAgentStrategy(StrOpt) Class that implements datastore-specific Guest Agent API logic.
= os_admin, root, clusterrepuser(ListOpt) Users to exclude when listing users.
= 3(IntOpt) Minimum number of members in PXC cluster.
= /var/lib/mysql(StrOpt) Filesystem path for mounting volumes if volume support is enabled.
= trove.guestagent.strategies.replication.mysql_gtid(StrOpt) Namespace to load replication strategies from.
= MysqlGTIDReplication(StrOpt) Default strategy for replication.
= slave_user(StrOpt) Userid for replication slave.
= trove.guestagent.strategies.restore.mysql_impl(StrOpt) Namespace to load restore strategies from.
= trove.extensions.common.service.DefaultRootController(StrOpt) Root controller implementation for pxc.
= False(BoolOpt) Enable the automatic creation of the root user for the service during instance-create. The generated password for the root user is immediately returned in the response of instance-create as the 'password' field.
= trove.common.strategies.cluster.experimental.pxc.taskmanager.PXCTaskManagerStrategy(StrOpt) Class that implements datastore-specific task manager logic.
= 3306, 4444, 4567, 4568(ListOpt) List of TCP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).
= (ListOpt) List of UDP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True).
= 450(IntOpt) Maximum time (in seconds) to wait for a Guest to become active.
= True(BoolOpt) Whether to provision a Cinder volume for datadir.
+ diff --git a/doc/common/tables/trove-db_redis.xml b/doc/common/tables/trove-db_redis.xml index f0a5d4ad2a..b95904da80 100644 --- a/doc/common/tables/trove-db_redis.xml +++ b/doc/common/tables/trove-db_redis.xml @@ -17,36 +17,60 @@ [redis] + + = trove.common.strategies.cluster.experimental.redis.api.RedisAPIStrategy + (StrOpt) Class that implements datastore-specific API logic. + = {} (DictOpt) Incremental Backup Runner based on the default strategy. For strategies that do not implement an incremental, the runner will use the default full backup. - = None + = trove.guestagent.strategies.backup.experimental.redis_impl (StrOpt) Namespace to load backup strategies from. - = None + = RedisBackup (StrOpt) Default strategy to perform backups. + + = True + (BoolOpt) Enable clusters to be created and managed. + = None (StrOpt) Device path for volume if volume support is enabled. + + = trove.common.strategies.cluster.experimental.redis.guestagent.RedisGuestAgentStrategy + (StrOpt) Class that implements datastore-specific Guest Agent API logic. + = /var/lib/redis (StrOpt) Filesystem path for mounting volumes if volume support is enabled. - = None + = trove.guestagent.strategies.replication.experimental.redis_sync + (StrOpt) Namespace to load replication strategies from. + + + = RedisSyncReplication (StrOpt) Default strategy for replication. - = None + = trove.guestagent.strategies.restore.experimental.redis_impl (StrOpt) Namespace to load restore strategies from. - = 6379 + = trove.extensions.common.service.DefaultRootController + (StrOpt) Root controller implementation for redis. + + + = trove.common.strategies.cluster.experimental.redis.taskmanager.RedisTaskManagerStrategy + (StrOpt) Class that implements datastore-specific task manager logic. + + + = 6379, 16379 (ListOpt) List of TCP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True). @@ -54,7 +78,7 @@ (ListOpt) List of UDP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True). - = False + = True (BoolOpt) Whether to provision a Cinder volume for datadir. diff --git a/doc/common/tables/trove-db_vertica.xml b/doc/common/tables/trove-db_vertica.xml index eb625d63b0..d187686c7b 100644 --- a/doc/common/tables/trove-db_vertica.xml +++ b/doc/common/tables/trove-db_vertica.xml @@ -65,6 +65,10 @@ = None (StrOpt) Namespace to load restore strategies from. + + = trove.extensions.vertica.service.VerticaRootController + (StrOpt) Root controller implementation for Vertica. + = trove.common.strategies.cluster.experimental.vertica.taskmanager.VerticaTaskManagerStrategy (StrOpt) Class that implements datastore-specific task manager logic. diff --git a/doc/common/tables/trove-guestagent.xml b/doc/common/tables/trove-guestagent.xml index e82e4698d4..bc7f1a2505 100644 --- a/doc/common/tables/trove-guestagent.xml +++ b/doc/common/tables/trove-guestagent.xml @@ -50,7 +50,7 @@ (StrOpt) The guest info filename found in the injected config location. If a full path is specified then it will be used as the path to the guest info file - = lost+found, #mysql50#lost+found, mysql, information_schema + = mysql, information_schema, performance_schema (ListOpt) Databases to exclude when listing databases. diff --git a/doc/common/tables/trove-logging.xml b/doc/common/tables/trove-logging.xml index 7df251c61b..4065930a44 100644 --- a/doc/common/tables/trove-logging.xml +++ b/doc/common/tables/trove-logging.xml @@ -23,7 +23,7 @@ = 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. + (ListOpt) List of logger=LEVEL pairs. This option is ignored if log_config_append is set. = False @@ -43,23 +43,23 @@ = 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. + (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). = %Y-%m-%d %H:%M:%S - (StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s . + (StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set. = None - (StrOpt) (Optional) The base directory used for relative --log-file paths. + (StrOpt) (Optional) The base directory used for relative --log-file paths. This option is ignored if log_config_append is set. = None - (StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. + (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. = 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. + (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. = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s @@ -87,24 +87,28 @@ = LOG_USER - (StrOpt) Syslog facility to receive log lines. + (StrOpt) Syslog facility to receive log lines. This option is ignored if log_config_append is set. = True - (BoolOpt) Log output to standard error. + (BoolOpt) Log output to standard error. This option is ignored if log_config_append is set. = False - (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. + (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. = 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. + (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. = True (BoolOpt) If set to false, will disable INFO logging level, making WARNING the default. + + = 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. + diff --git a/doc/common/tables/trove-nova.xml b/doc/common/tables/trove-nova.xml index 0cb6f00b9a..5646f93c4b 100644 --- a/doc/common/tables/trove-nova.xml +++ b/doc/common/tables/trove-nova.xml @@ -25,6 +25,10 @@ = (StrOpt) Admin tenant ID used to connect to Nova. + + = + (StrOpt) Admin tenant name used to connect to Nova. + = (StrOpt) Admin username used to connect to Nova. diff --git a/doc/common/tables/trove-redis.xml b/doc/common/tables/trove-redis.xml index 32f0e00372..115a8a43b3 100644 --- a/doc/common/tables/trove-redis.xml +++ b/doc/common/tables/trove-redis.xml @@ -15,14 +15,10 @@ - [matchmaker_redis] + [DEFAULT] - = 127.0.0.1 - (StrOpt) Host to locate redis. - - - = None + = (StrOpt) Password for Redis server (optional). @@ -30,11 +26,19 @@ (IntOpt) Use this port to connect to redis host. - [matchmaker_ring] + [matchmaker_redis] - = /etc/oslo/matchmaker_ring.json - (StrOpt) Matchmaker ring file (JSON). + = 127.0.0.1 + (StrOpt) Host to locate redis. + + + = + (StrOpt) Password for Redis server (optional). + + + = 6379 + (IntOpt) Use this port to connect to redis host. diff --git a/doc/common/tables/trove-rpc.xml b/doc/common/tables/trove-rpc.xml index c51f394b81..f17414db87 100644 --- a/doc/common/tables/trove-rpc.xml +++ b/doc/common/tables/trove-rpc.xml @@ -17,14 +17,6 @@ [DEFAULT] - - = 300 - (IntOpt) Heartbeat frequency. - - - = 600 - (IntOpt) Heartbeat time-to-live. - = 3 (IntOpt) Number of times to check if a volume exists. @@ -45,6 +37,10 @@ = 30 (IntOpt) Size of RPC connection pool. + + = 1 + (IntOpt) The default number of seconds that poll should wait. Poll raises timeout exception when timeout expired. + = 60 (IntOpt) Seconds to wait for a response from a call. @@ -83,6 +79,22 @@ = 0 (IntOpt) Timeout for inactive connections (in seconds) + + = + (StrOpt) Password for message broker authentication + + + = + (StrOpt) Path to directory that contains the SASL configuration + + + = + (StrOpt) Name of configuration file (without .conf suffix) + + + = + (StrOpt) Space separated list of acceptable SASL mechanisms + = exclusive (StrOpt) address prefix used when sending to a specific server @@ -107,6 +119,10 @@ = False (BoolOpt) Debug: dump AMQP frames to stdout + + = + (StrOpt) User name for message broker authentication + diff --git a/doc/common/tables/trove-zeromq.xml b/doc/common/tables/trove-zeromq.xml index cb31212030..743680032e 100644 --- a/doc/common/tables/trove-zeromq.xml +++ b/doc/common/tables/trove-zeromq.xml @@ -17,10 +17,18 @@ [DEFAULT] + + = True + (BoolOpt) Use REQ/REP pattern for all methods CALL/CAST/FANOUT. + = * (StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address. + + = eventlet + (StrOpt) Type of concurrency used. Either "native" or "eventlet" + = 1 (IntOpt) Number of ZeroMQ contexts, defaults to 1. @@ -34,17 +42,17 @@ (StrOpt) Directory for holding IPC sockets. - = local + = redis (StrOpt) MatchMaker driver. - - = 9501 - (IntOpt) ZeroMQ receiver listening port. - = None (IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited. + + = True + (BoolOpt) Shows whether zmq-messaging uses broker or not. + diff --git a/doc/config-reference/database-service/section-databaseservice-db.xml b/doc/config-reference/database-service/section-databaseservice-db.xml index f318d3b8da..68fe24fad8 100644 --- a/doc/config-reference/database-service/section-databaseservice-db.xml +++ b/doc/config-reference/database-service/section-databaseservice-db.xml @@ -12,8 +12,10 @@ + + diff --git a/tools/autogenerate-config-flagmappings/trove.flagmappings b/tools/autogenerate-config-flagmappings/trove.flagmappings index 7a0340f949..970d5bd6d9 100644 --- a/tools/autogenerate-config-flagmappings/trove.flagmappings +++ b/tools/autogenerate-config-flagmappings/trove.flagmappings @@ -93,8 +93,6 @@ logging_context_format_string logging logging_debug_format_suffix logging logging_default_format_string logging logging_exception_prefix logging -matchmaker_heartbeat_freq rpc -matchmaker_heartbeat_ttl rpc max_accepted_volume_size quota max_backups_per_user quota max_header_line api @@ -115,9 +113,12 @@ nova_compute_service_type compute nova_compute_url compute 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 os_region_name api +password redis +port redis publish_errors logging pybasedir common pydev_debug debug @@ -143,13 +144,15 @@ root_grant_option compute rpc_backend rpc 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_concurrency zeromq rpc_zmq_contexts zeromq rpc_zmq_host zeromq rpc_zmq_ipc_dir zeromq rpc_zmq_matchmaker zeromq -rpc_zmq_port zeromq rpc_zmq_topic_backlog zeromq server_delete_time_out taskmanager sql_query_logging database @@ -163,6 +166,7 @@ syslog_log_facility logging taskmanager_queue common tcp_keepidle api template_path common +timeout_wait_for_service common transport_url amqp trove_api_workers api trove_auth_url api @@ -187,6 +191,8 @@ verify_swift_checksum_on_restore taskmanager volume_format_timeout volume volume_fstype volume volume_time_out volume +watch_log_file logging +zmq_use_broker zeromq cassandra/backup_incremental_strategy db_cassandra cassandra/backup_namespace db_cassandra cassandra/backup_strategy db_cassandra @@ -194,6 +200,7 @@ cassandra/device_path db_cassandra cassandra/mount_point db_cassandra cassandra/replication_strategy db_cassandra cassandra/restore_namespace db_cassandra +cassandra/root_controller cassandra cassandra/tcp_ports db_cassandra cassandra/udp_ports db_cassandra cassandra/volume_support db_cassandra @@ -204,6 +211,7 @@ couchbase/device_path db_couchbase couchbase/mount_point db_couchbase couchbase/replication_strategy db_couchbase couchbase/restore_namespace db_couchbase +couchbase/root_controller db_couchbase couchbase/root_on_create db_couchbase couchbase/tcp_ports db_couchbase couchbase/udp_ports db_couchbase @@ -215,6 +223,7 @@ couchdb/device_path db_couchbase couchdb/mount_point db_couchbase couchdb/replication_strategy db_couchbase couchdb/restore_namespace db_couchbase +couchdb/root_controller db_couchbase couchdb/root_on_create db_couchbase couchdb/tcp_ports db_couchbase couchdb/udp_ports db_couchbase @@ -230,6 +239,7 @@ db2/ignore_users db_db2 db2/mount_point db_db2 db2/replication_strategy db_db2 db2/restore_namespace db_db2 +db2/root_controller db_db2 db2/root_on_create db_db2 db2/tcp_ports db_db2 db2/udp_ports db_db2 @@ -268,13 +278,28 @@ keystone_authtoken/memcache_secret_key auth_token keystone_authtoken/memcache_security_strategy auth_token keystone_authtoken/memcache_use_advanced_pool auth_token keystone_authtoken/memcached_servers common +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 +mariadb/backup_incremental_strategy db_mariadb +mariadb/backup_namespace db_mariadb +mariadb/backup_strategy db_mariadb +mariadb/device_path db_mariadb +mariadb/mount_point db_mariadb +mariadb/replication_namespace db_mariadb +mariadb/replication_strategy db_mariadb +mariadb/restore_namespace db_mariadb +mariadb/root_controller db_mariadb +mariadb/root_on_create db_mariadb +mariadb/tcp_ports db_mariadb +mariadb/udp_ports db_mariadb +mariadb/usage_timeout db_mariadb +mariadb/volume_support db_mariadb matchmaker_redis/host redis matchmaker_redis/password redis matchmaker_redis/port redis -matchmaker_ring/ringfile redis +mongodb/add_members_timeout db_mongodb mongodb/api_strategy db_mongodb mongodb/backup_incremental_strategy db_mongodb mongodb/backup_namespace db_mongodb @@ -291,6 +316,7 @@ mongodb/num_config_servers_per_cluster db_mongodb mongodb/num_query_routers_per_cluster db_mongodb mongodb/replication_strategy db_mongodb mongodb/restore_namespace db_mongodb +mongodb/root_controller db_mongodb mongodb/taskmanager_strategy db_mongodb mongodb/tcp_ports db_mongodb mongodb/udp_ports db_mongodb @@ -303,6 +329,7 @@ mysql/mount_point db_mysql mysql/replication_namespace db_mysql mysql/replication_strategy db_mysql mysql/restore_namespace db_mysql +mysql/root_controller db_mysql mysql/root_on_create db_mysql mysql/tcp_ports db_mysql mysql/udp_ports db_mysql @@ -315,12 +342,17 @@ oslo_messaging_amqp/broadcast_prefix rpc oslo_messaging_amqp/container_name rpc oslo_messaging_amqp/group_request_prefix rpc oslo_messaging_amqp/idle_timeout rpc +oslo_messaging_amqp/password rpc +oslo_messaging_amqp/sasl_config_dir rpc +oslo_messaging_amqp/sasl_config_name rpc +oslo_messaging_amqp/sasl_mechanisms rpc oslo_messaging_amqp/server_request_prefix rpc oslo_messaging_amqp/ssl_ca_file rpc oslo_messaging_amqp/ssl_cert_file rpc 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 @@ -369,6 +401,7 @@ percona/replication_password db_percona percona/replication_strategy db_percona percona/replication_user db_percona percona/restore_namespace db_percona +percona/root_controller db_percona percona/root_on_create db_percona percona/tcp_ports db_percona percona/udp_ports db_percona @@ -382,19 +415,47 @@ postgresql/ignore_dbs db_postgresql postgresql/ignore_users db_postgresql postgresql/mount_point db_postgresql postgresql/restore_namespace db_postgresql +postgresql/root_controller db_postgresql postgresql/root_on_create db_postgresql postgresql/tcp_ports db_postgresql postgresql/udp_ports db_postgresql postgresql/volume_support db_postgresql profiler/enabled debug profiler/trace_sqlalchemy debug +pxc/api_strategy db_pxc +pxc/backup_incremental_strategy db_pxc +pxc/backup_namespace db_pxc +pxc/backup_strategy db_pxc +pxc/cluster_support db_pxc +pxc/device_path db_pxc +pxc/guestagent_strategy db_pxc +pxc/ignore_users db_pxc +pxc/min_cluster_member_count db_pxc +pxc/mount_point db_pxc +pxc/replication_namespace db_pxc +pxc/replication_strategy db_pxc +pxc/replication_user db_pxc +pxc/restore_namespace db_pxc +pxc/root_controller db_pxc +pxc/root_on_create db_pxc +pxc/taskmanager_strategy db_pxc +pxc/tcp_ports db_pxc +pxc/udp_ports db_pxc +pxc/usage_timeout db_pxc +pxc/volume_support db_pxc +redis/api_strategy db_redis redis/backup_incremental_strategy db_redis redis/backup_namespace db_redis redis/backup_strategy db_redis +redis/cluster_support db_redis redis/device_path db_redis +redis/guestagent_strategy db_redis redis/mount_point db_redis +redis/replication_namespace db_redis redis/replication_strategy db_redis redis/restore_namespace db_redis +redis/root_controller db_redis +redis/taskmanager_strategy db_redis redis/tcp_ports db_redis redis/udp_ports db_redis redis/volume_support db_redis @@ -413,6 +474,7 @@ vertica/mount_point db_vertica vertica/readahead_size db_vertica vertica/replication_strategy db_vertica vertica/restore_namespace db_vertica +vertica/root_controller db_vertica vertica/taskmanager_strategy db_vertica vertica/tcp_ports db_vertica vertica/udp_ports db_vertica diff --git a/tools/autogenerate-config-flagmappings/trove.headers b/tools/autogenerate-config-flagmappings/trove.headers index 8228d97332..d1cce57aca 100644 --- a/tools/autogenerate-config-flagmappings/trove.headers +++ b/tools/autogenerate-config-flagmappings/trove.headers @@ -3,10 +3,12 @@ cluster cluster db_cassandra Cassandra database db_couchbase Couchbase database db_db2 DB2 database +db_mariadb MariaDB database db_mongodb MongoDB database db_mysql MySQL database db_percona Percona database db_postgresql PostgreSQL database +db_pxc Percona XtraDB Cluster database db_redis Redis database db_vertica Vertica database dns DNS