diff --git a/doc/common/tables/trove-common.xml b/doc/common/tables/trove-common.xml index 4810c2e63b..d2df1123e7 100644 --- a/doc/common/tables/trove-common.xml +++ b/doc/common/tables/trove-common.xml @@ -37,6 +37,10 @@ = 36 (IntOpt) Character length of generated passwords. + + = 64 + (IntOpt) Size of executor thread pool. + = json (ListOpt) Filetype endings not to be reattached to an ID by the utils method correct_id_with_req. @@ -50,7 +54,7 @@ (ListOpt) Memcached servers or None for in process cache. - = /usr/lib/python/site-packages/trove/trove + = /home/sakaia/work/openstack-doc-tools/autogenerate_config_docs/sources/trove/trove (StrOpt) Directory where the Trove python module is installed. diff --git a/doc/common/tables/trove-db_mongodb.xml b/doc/common/tables/trove-db_mongodb.xml index 203d420ab9..b420ae34cf 100644 --- a/doc/common/tables/trove-db_mongodb.xml +++ b/doc/common/tables/trove-db_mongodb.xml @@ -49,6 +49,14 @@ = trove.common.strategies.cluster.experimental.mongodb.guestagent.MongoDbGuestAgentStrategy (StrOpt) Class that implements datastore-specific Guest Agent API logic. + + = admin, local, config + (ListOpt) Databases to exclude when listing databases. + + + = admin.os_admin, admin.root + (ListOpt) Users to exclude when listing users. + = 27017 (IntOpt) Port for mongod and mongos instances. diff --git a/doc/common/tables/trove-debug.xml b/doc/common/tables/trove-debug.xml index ef3ed56133..4a3bf3943a 100644 --- a/doc/common/tables/trove-debug.xml +++ b/doc/common/tables/trove-debug.xml @@ -17,10 +17,6 @@ [DEFAULT] - - = None - (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> results in listening on the smallest unused port number within the specified range of port numbers. The chosen port is displayed in the service's log file. - = 4096 (IntOpt) Number of backlog requests to configure the socket with diff --git a/doc/common/tables/trove-logging.xml b/doc/common/tables/trove-logging.xml index 7e6bc41412..7df251c61b 100644 --- a/doc/common/tables/trove-logging.xml +++ b/doc/common/tables/trove-logging.xml @@ -19,10 +19,10 @@ = False - (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). + (BoolOpt) Print debugging output (set logging level to DEBUG instead of default INFO level). - = 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, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN + = 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. @@ -74,7 +74,7 @@ (StrOpt) Format string to use for log messages without context. - = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s + = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s (StrOpt) Prefix each line of exception output with this format. @@ -95,15 +95,15 @@ = False - (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424. + (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. - = False - (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 I, and will be removed in J. + = 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. - = False - (BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level). + = True + (BoolOpt) If set to false, will disable INFO logging level, making WARNING the default. diff --git a/doc/common/tables/trove-qpid.xml b/doc/common/tables/trove-qpid.xml index baa7050cc1..b4c2cdc30c 100644 --- a/doc/common/tables/trove-qpid.xml +++ b/doc/common/tables/trove-qpid.xml @@ -71,7 +71,7 @@ = 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 M release. + (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. diff --git a/doc/common/tables/trove-rabbitmq.xml b/doc/common/tables/trove-rabbitmq.xml index 5a74d8c824..7ac95fcec1 100644 --- a/doc/common/tables/trove-rabbitmq.xml +++ b/doc/common/tables/trove-rabbitmq.xml @@ -111,7 +111,7 @@ = 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 M release. + (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. diff --git a/doc/common/tables/trove-rpc.xml b/doc/common/tables/trove-rpc.xml index ed06cb81ab..c51f394b81 100644 --- a/doc/common/tables/trove-rpc.xml +++ b/doc/common/tables/trove-rpc.xml @@ -30,7 +30,7 @@ (IntOpt) Number of times to check if a volume exists. - = 10 + = 30 (IntOpt) The interval (in seconds) which periodic tasks are run. @@ -49,10 +49,6 @@ = 60 (IntOpt) Seconds to wait for a response from a call. - - = 64 - (IntOpt) Size of RPC thread pool. - [oslo_concurrency] diff --git a/doc/common/tables/trove-taskmanager.xml b/doc/common/tables/trove-taskmanager.xml index 28d71ce82f..d3a787c35a 100644 --- a/doc/common/tables/trove-taskmanager.xml +++ b/doc/common/tables/trove-taskmanager.xml @@ -30,8 +30,8 @@ (DictOpt) Extension for default datastore managers. Allows the use of custom managers for each of the datastores supported by Trove. - = 360 - (IntOpt) Number of report_intervals to wait between pushing events (see report_interval). + = 3600 + (IntOpt) Seconds to wait between pushing events. = None diff --git a/tools/autogenerate-config-flagmappings/trove.flagmappings b/tools/autogenerate-config-flagmappings/trove.flagmappings index fed4a36552..7a0340f949 100644 --- a/tools/autogenerate-config-flagmappings/trove.flagmappings +++ b/tools/autogenerate-config-flagmappings/trove.flagmappings @@ -5,7 +5,6 @@ agent_heartbeat_expiry guestagent agent_heartbeat_time guestagent agent_replication_snapshot_timeout guestagent api_paste_config api -backdoor_port debug backlog debug backup_aes_cbc_key backup backup_chunk_size backup @@ -58,7 +57,8 @@ dns_service_type dns dns_time_out dns dns_ttl dns dns_username dns -exists_notification_ticks taskmanager +executor_thread_pool_size common +exists_notification_interval taskmanager exists_notification_transformer taskmanager expected_filetype_suffixes common fatal_deprecations logging @@ -144,7 +144,6 @@ rpc_backend rpc rpc_cast_timeout rpc rpc_conn_pool_size rpc rpc_response_timeout rpc -rpc_thread_pool_size rpc rpc_zmq_bind_address zeromq rpc_zmq_contexts zeromq rpc_zmq_host zeromq @@ -284,6 +283,8 @@ mongodb/cluster_support db_mongodb mongodb/configsvr_port db_mongodb mongodb/device_path db_mongodb mongodb/guestagent_strategy db_mongodb +mongodb/ignore_dbs db_mongodb +mongodb/ignore_users db_mongodb mongodb/mongodb_port db_mongodb mongodb/mount_point db_mongodb mongodb/num_config_servers_per_cluster db_mongodb @@ -397,9 +398,6 @@ redis/restore_namespace db_redis redis/tcp_ports db_redis redis/udp_ports db_redis redis/volume_support db_redis -ssl/ca_file ca -ssl/cert_file ca -ssl/key_file ca upgrade_levels/conductor upgrades upgrade_levels/guestagent upgrades upgrade_levels/taskmanager upgrades