Merge "Update Config reference for trove"

This commit is contained in:
Jenkins 2015-09-03 14:54:40 +00:00 committed by Gerrit Code Review
commit d996580402
9 changed files with 30 additions and 28 deletions

View File

@ -37,6 +37,10 @@
<td><option>default_password_length</option> = <replaceable>36</replaceable></td>
<td>(IntOpt) Character length of generated passwords.</td>
</tr>
<tr>
<td><option>executor_thread_pool_size</option> = <replaceable>64</replaceable></td>
<td>(IntOpt) Size of executor thread pool.</td>
</tr>
<tr>
<td><option>expected_filetype_suffixes</option> = <replaceable>json</replaceable></td>
<td>(ListOpt) Filetype endings not to be reattached to an ID by the utils method correct_id_with_req.</td>
@ -50,7 +54,7 @@
<td>(ListOpt) Memcached servers or None for in process cache.</td>
</tr>
<tr>
<td><option>pybasedir</option> = <replaceable>/usr/lib/python/site-packages/trove/trove</replaceable></td>
<td><option>pybasedir</option> = <replaceable>/home/sakaia/work/openstack-doc-tools/autogenerate_config_docs/sources/trove/trove</replaceable></td>
<td>(StrOpt) Directory where the Trove python module is installed.</td>
</tr>
<tr>

View File

@ -49,6 +49,14 @@
<td><option>guestagent_strategy</option> = <replaceable>trove.common.strategies.cluster.experimental.mongodb.guestagent.MongoDbGuestAgentStrategy</replaceable></td>
<td>(StrOpt) Class that implements datastore-specific Guest Agent API logic.</td>
</tr>
<tr>
<td><option>ignore_dbs</option> = <replaceable>admin, local, config</replaceable></td>
<td>(ListOpt) Databases to exclude when listing databases.</td>
</tr>
<tr>
<td><option>ignore_users</option> = <replaceable>admin.os_admin, admin.root</replaceable></td>
<td>(ListOpt) Users to exclude when listing users.</td>
</tr>
<tr>
<td><option>mongodb_port</option> = <replaceable>27017</replaceable></td>
<td>(IntOpt) Port for mongod and mongos instances.</td>

View File

@ -17,10 +17,6 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td><option>backdoor_port</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Enable eventlet backdoor. Acceptable values are 0, &lt;port&gt;, and &lt;start&gt;:&lt;end&gt;, where 0 results in listening on a random tcp port number; &lt;port&gt; results in listening on the specified port number (and not enabling backdoor if that port is in use); and &lt;start&gt;:&lt;end&gt; 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.</td>
</tr>
<tr>
<td><option>backlog</option> = <replaceable>4096</replaceable></td>
<td>(IntOpt) Number of backlog requests to configure the socket with</td>

View File

@ -19,10 +19,10 @@
</tr>
<tr>
<td><option>debug</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level).</td>
<td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default INFO level).</td>
</tr>
<tr>
<td><option>default_log_levels</option> = <replaceable>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</replaceable></td>
<td><option>default_log_levels</option> = <replaceable>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</replaceable></td>
<td>(ListOpt) List of logger=LEVEL pairs.</td>
</tr>
<tr>
@ -74,7 +74,7 @@
<td>(StrOpt) Format string to use for log messages without context.</td>
</tr>
<tr>
<td><option>logging_exception_prefix</option> = <replaceable>%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s</replaceable></td>
<td><option>logging_exception_prefix</option> = <replaceable>%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s</replaceable></td>
<td>(StrOpt) Prefix each line of exception output with this format.</td>
</tr>
<tr>
@ -95,15 +95,15 @@
</tr>
<tr>
<td><option>use_syslog</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424.</td>
<td>(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424.</td>
</tr>
<tr>
<td><option>use_syslog_rfc_format</option> = <replaceable>False</replaceable></td>
<td>(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.</td>
<td><option>use_syslog_rfc_format</option> = <replaceable>True</replaceable></td>
<td>(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.</td>
</tr>
<tr>
<td><option>verbose</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level).</td>
<td><option>verbose</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) If set to false, will disable INFO logging level, making WARNING the default.</td>
</tr>
</tbody>
</table>

View File

@ -71,7 +71,7 @@
</tr>
<tr>
<td><option>send_single_reply</option> = <replaceable>False</replaceable></td>
<td>(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.</td>
<td>(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.</td>
</tr>
</tbody>
</table>

View File

@ -111,7 +111,7 @@
</tr>
<tr>
<td><option>send_single_reply</option> = <replaceable>False</replaceable></td>
<td>(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.</td>
<td>(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.</td>
</tr>
</tbody>
</table>

View File

@ -30,7 +30,7 @@
<td>(IntOpt) Number of times to check if a volume exists.</td>
</tr>
<tr>
<td><option>report_interval</option> = <replaceable>10</replaceable></td>
<td><option>report_interval</option> = <replaceable>30</replaceable></td>
<td>(IntOpt) The interval (in seconds) which periodic tasks are run.</td>
</tr>
<tr>
@ -49,10 +49,6 @@
<td><option>rpc_response_timeout</option> = <replaceable>60</replaceable></td>
<td>(IntOpt) Seconds to wait for a response from a call.</td>
</tr>
<tr>
<td><option>rpc_thread_pool_size</option> = <replaceable>64</replaceable></td>
<td>(IntOpt) Size of RPC thread pool.</td>
</tr>
<tr>
<th colspan="2">[oslo_concurrency]</th>
</tr>

View File

@ -30,8 +30,8 @@
<td>(DictOpt) Extension for default datastore managers. Allows the use of custom managers for each of the datastores supported by Trove.</td>
</tr>
<tr>
<td><option>exists_notification_ticks</option> = <replaceable>360</replaceable></td>
<td>(IntOpt) Number of report_intervals to wait between pushing events (see report_interval).</td>
<td><option>exists_notification_interval</option> = <replaceable>3600</replaceable></td>
<td>(IntOpt) Seconds to wait between pushing events.</td>
</tr>
<tr>
<td><option>exists_notification_transformer</option> = <replaceable>None</replaceable></td>

View File

@ -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