Merge "update glance flags and tables"

This commit is contained in:
Jenkins 2014-03-19 09:12:04 +00:00 committed by Gerrit Code Review
commit 998e92d832
27 changed files with 98 additions and 78 deletions

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_amqp">
<caption>Description of configuration options for amqp</caption>
<col width="50%"/>
<col width="50%"/>
@ -28,11 +28,11 @@
</tr>
<tr>
<td>notification_driver = []</td>
<td>(MultiStrOpt) Driver or drivers to handle sending notifications</td>
<td>(MultiStrOpt) Driver or drivers to handle sending notifications.</td>
</tr>
<tr>
<td>notification_topics = notifications</td>
<td>(ListOpt) AMQP topic used for OpenStack notifications</td>
<td>(ListOpt) AMQP topic used for OpenStack notifications.</td>
</tr>
<tr>
<td>rpc_backend = rabbit</td>
@ -40,15 +40,15 @@
</tr>
<tr>
<td>rpc_conn_pool_size = 30</td>
<td>(IntOpt) Size of RPC connection pool</td>
<td>(IntOpt) Size of RPC connection pool.</td>
</tr>
<tr>
<td>rpc_response_timeout = 60</td>
<td>(IntOpt) Seconds to wait for a response from a call</td>
<td>(IntOpt) Seconds to wait for a response from a call.</td>
</tr>
<tr>
<td>rpc_thread_pool_size = 64</td>
<td>(IntOpt) Size of RPC greenthread pool</td>
<td>(IntOpt) Size of RPC greenthread pool.</td>
</tr>
<tr>
<td>transport_url = None</td>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_api">
<caption>Description of configuration options for api</caption>
<col width="50%"/>
<col width="50%"/>
@ -38,16 +38,24 @@
<td>enable_v1_api = True</td>
<td>(BoolOpt) Deploy the v1 OpenStack Images API.</td>
</tr>
<tr>
<td>enable_v1_registry = True</td>
<td>(BoolOpt) Deploy the v1 OpenStack Registry API.</td>
</tr>
<tr>
<td>enable_v2_api = True</td>
<td>(BoolOpt) Deploy the v2 OpenStack Images API.</td>
</tr>
<tr>
<td>enable_v2_registry = True</td>
<td>(BoolOpt) Deploy the v2 OpenStack Registry API.</td>
</tr>
<tr>
<td>image_size_cap = 1099511627776</td>
<td>(IntOpt) Maximum size of image a user can upload in bytes. Defaults to 1099511627776 bytes (1 TB).</td>
</tr>
<tr>
<td>known_stores = glance.store.filesystem.Store, glance.store.http.Store, glance.store.rbd.Store, glance.store.s3.Store, glance.store.swift.Store, glance.store.sheepdog.Store, glance.store.cinder.Store, glance.store.vmware_datastore.Store</td>
<td>known_stores = glance.store.filesystem.Store, glance.store.http.Store</td>
<td>(ListOpt) List of which store classes and store class locations are currently known to glance at startup.</td>
</tr>
<tr>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_cinder">
<caption>Description of configuration options for cinder</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_common">
<caption>Description of configuration options for common</caption>
<col width="50%"/>
<col width="50%"/>
@ -106,7 +106,7 @@
<th colspan="2">[image_format]</th>
</tr>
<tr>
<td>container_formats = ami, ari, aki, bare, ovf</td>
<td>container_formats = ami, ari, aki, bare, ovf, ova</td>
<td>(ListOpt) Supported values for the 'container_format' image attribute</td>
</tr>
<tr>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_db">
<caption>Description of configuration options for db</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_filesystem">
<caption>Description of configuration options for filesystem</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_gridfs">
<caption>Description of configuration options for gridfs</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_imagecache">
<caption>Description of configuration options for imagecache</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_logging">
<caption>Description of configuration options for logging</caption>
<col width="50%"/>
<col width="50%"/>
@ -82,6 +82,10 @@
<td>syslog-log-facility = LOG_USER</td>
<td>(StrOpt) Syslog facility to receive log lines</td>
</tr>
<tr>
<td>use_stderr = True</td>
<td>(BoolOpt) Log output to standard error</td>
</tr>
<tr>
<td>use-syslog = False</td>
<td>(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and then will be changed in J to honor RFC5424</td>
@ -90,10 +94,6 @@
<td>use-syslog-rfc-format = False</td>
<td>(BoolOpt) (Optional) Use syslog rfc5424 format for logging. If enabled, will add APP-NAME (RFC5424) before the MSG part of the syslog message. The old format without APP-NAME is deprecated in I, and will be removed in J.</td>
</tr>
<tr>
<td>use_stderr = True</td>
<td>(BoolOpt) Log output to standard error</td>
</tr>
<tr>
<td>verbose = False</td>
<td>(BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level).</td>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_matchmaker">
<caption>Description of configuration options for matchmaker</caption>
<col width="50%"/>
<col width="50%"/>
@ -20,7 +20,7 @@
</tr>
<tr>
<td>matchmaker_heartbeat_freq = 300</td>
<td>(IntOpt) Heartbeat frequency</td>
<td>(IntOpt) Heartbeat frequency.</td>
</tr>
<tr>
<td>matchmaker_heartbeat_ttl = 600</td>
@ -31,7 +31,7 @@
</tr>
<tr>
<td>ringfile = /etc/oslo/matchmaker_ring.json</td>
<td>(StrOpt) Matchmaker ring file (JSON)</td>
<td>(StrOpt) Matchmaker ring file (JSON).</td>
</tr>
</tbody>
</table>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_paste">
<caption>Description of configuration options for paste</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_policy">
<caption>Description of configuration options for policy</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_qpid">
<caption>Description of configuration options for qpid</caption>
<col width="50%"/>
<col width="50%"/>
@ -20,35 +20,35 @@
</tr>
<tr>
<td>qpid_heartbeat = 60</td>
<td>(IntOpt) Seconds between connection keepalive heartbeats</td>
<td>(IntOpt) Seconds between connection keepalive heartbeats.</td>
</tr>
<tr>
<td>qpid_hostname = oslo</td>
<td>(StrOpt) Qpid broker hostname</td>
<td>(StrOpt) Qpid broker hostname.</td>
</tr>
<tr>
<td>qpid_hosts = $qpid_hostname:$qpid_port</td>
<td>(ListOpt) Qpid HA cluster host:port pairs</td>
<td>(ListOpt) Qpid HA cluster host:port pairs.</td>
</tr>
<tr>
<td>qpid_password = </td>
<td>(StrOpt) Password for Qpid connection</td>
<td>(StrOpt) Password for Qpid connection.</td>
</tr>
<tr>
<td>qpid_port = 5672</td>
<td>(IntOpt) Qpid broker port</td>
<td>(IntOpt) Qpid broker port.</td>
</tr>
<tr>
<td>qpid_protocol = tcp</td>
<td>(StrOpt) Transport to use, either 'tcp' or 'ssl'</td>
<td>(StrOpt) Transport to use, either 'tcp' or 'ssl'.</td>
</tr>
<tr>
<td>qpid_sasl_mechanisms = </td>
<td>(StrOpt) Space separated list of SASL mechanisms to use for auth</td>
<td>(StrOpt) Space separated list of SASL mechanisms to use for auth.</td>
</tr>
<tr>
<td>qpid_tcp_nodelay = True</td>
<td>(BoolOpt) Disable Nagle algorithm</td>
<td>(BoolOpt) Whether to disable the Nagle algorithm.</td>
</tr>
<tr>
<td>qpid_topology_version = 1</td>
@ -56,7 +56,7 @@
</tr>
<tr>
<td>qpid_username = </td>
<td>(StrOpt) Username for Qpid connection</td>
<td>(StrOpt) Username for Qpid connection.</td>
</tr>
</tbody>
</table>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_rabbitmq">
<caption>Description of configuration options for rabbitmq</caption>
<col width="50%"/>
<col width="50%"/>
@ -24,23 +24,27 @@
</tr>
<tr>
<td>fake_rabbit = False</td>
<td>(BoolOpt) If passed, use a fake RabbitMQ provider</td>
<td>(BoolOpt) If passed, use a fake RabbitMQ provider.</td>
</tr>
<tr>
<td>kombu_reconnect_delay = 1.0</td>
<td>(FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification.</td>
</tr>
<tr>
<td>kombu_ssl_ca_certs = </td>
<td>(StrOpt) SSL certification authority file (valid only if SSL enabled)</td>
<td>(StrOpt) SSL certification authority file (valid only if SSL enabled).</td>
</tr>
<tr>
<td>kombu_ssl_certfile = </td>
<td>(StrOpt) SSL cert file (valid only if SSL enabled)</td>
<td>(StrOpt) SSL cert file (valid only if SSL enabled).</td>
</tr>
<tr>
<td>kombu_ssl_keyfile = </td>
<td>(StrOpt) SSL key file (valid only if SSL enabled)</td>
<td>(StrOpt) SSL key file (valid only if SSL enabled).</td>
</tr>
<tr>
<td>kombu_ssl_version = </td>
<td>(StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions</td>
<td>(StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions.</td>
</tr>
<tr>
<td>rabbit_ha_queues = False</td>
@ -48,43 +52,47 @@
</tr>
<tr>
<td>rabbit_host = oslo</td>
<td>(StrOpt) The RabbitMQ broker address where a single node is used</td>
<td>(StrOpt) The RabbitMQ broker address where a single node is used.</td>
</tr>
<tr>
<td>rabbit_hosts = $rabbit_host:$rabbit_port</td>
<td>(ListOpt) RabbitMQ HA cluster host:port pairs</td>
<td>(ListOpt) RabbitMQ HA cluster host:port pairs.</td>
</tr>
<tr>
<td>rabbit_login_method = AMQPLAIN</td>
<td>(StrOpt) the RabbitMQ login method</td>
</tr>
<tr>
<td>rabbit_max_retries = 0</td>
<td>(IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count)</td>
<td>(IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).</td>
</tr>
<tr>
<td>rabbit_password = guest</td>
<td>(StrOpt) The RabbitMQ password</td>
<td>(StrOpt) The RabbitMQ password.</td>
</tr>
<tr>
<td>rabbit_port = 5672</td>
<td>(IntOpt) The RabbitMQ broker port where a single node is used</td>
<td>(IntOpt) The RabbitMQ broker port where a single node is used.</td>
</tr>
<tr>
<td>rabbit_retry_backoff = 2</td>
<td>(IntOpt) How long to backoff for between retries when connecting to RabbitMQ</td>
<td>(IntOpt) How long to backoff for between retries when connecting to RabbitMQ.</td>
</tr>
<tr>
<td>rabbit_retry_interval = 1</td>
<td>(IntOpt) How frequently to retry connecting with RabbitMQ</td>
<td>(IntOpt) How frequently to retry connecting with RabbitMQ.</td>
</tr>
<tr>
<td>rabbit_use_ssl = False</td>
<td>(BoolOpt) Connect over SSL for RabbitMQ</td>
<td>(BoolOpt) Connect over SSL for RabbitMQ.</td>
</tr>
<tr>
<td>rabbit_userid = guest</td>
<td>(StrOpt) The RabbitMQ userid</td>
<td>(StrOpt) The RabbitMQ userid.</td>
</tr>
<tr>
<td>rabbit_virtual_host = /</td>
<td>(StrOpt) The RabbitMQ virtual host</td>
<td>(StrOpt) The RabbitMQ virtual host.</td>
</tr>
</tbody>
</table>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_rbd">
<caption>Description of configuration options for rbd</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_redis">
<caption>Description of configuration options for redis</caption>
<col width="50%"/>
<col width="50%"/>
@ -20,11 +20,11 @@
</tr>
<tr>
<td>host = 127.0.0.1</td>
<td>(StrOpt) Host to locate redis</td>
<td>(StrOpt) Host to locate redis.</td>
</tr>
<tr>
<td>password = None</td>
<td>(StrOpt) Password for Redis server. (optional)</td>
<td>(StrOpt) Password for Redis server (optional).</td>
</tr>
<tr>
<td>port = 6379</td>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_registry">
<caption>Description of configuration options for registry</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_rpc">
<caption>Description of configuration options for rpc</caption>
<col width="50%"/>
<col width="50%"/>
@ -19,7 +19,7 @@
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>allowed_rpc_exception_modules = oslo.messaging.exceptions, nova.exception, cinder.exception, exceptions</td>
<td>allowed_rpc_exception_modules = openstack.common.exception, glance.common.exception, exceptions</td>
<td>(ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call.</td>
</tr>
</tbody>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_s3">
<caption>Description of configuration options for s3</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_sheepdog">
<caption>Description of configuration options for sheepdog</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_ssl">
<caption>Description of configuration options for ssl</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_swift">
<caption>Description of configuration options for swift</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_testing">
<caption>Description of configuration options for testing</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_vmware">
<caption>Description of configuration options for vmware</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_wsgi">
<caption>Description of configuration options for wsgi</caption>
<col width="50%"/>
<col width="50%"/>

View File

@ -4,7 +4,7 @@
The tool to do so lives in the tools directory of this
repository -->
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<table rules="all">
<table rules="all" xml:id="config_table_glance_zmq">
<caption>Description of configuration options for zmq</caption>
<col width="50%"/>
<col width="50%"/>
@ -28,7 +28,7 @@
</tr>
<tr>
<td>rpc_zmq_contexts = 1</td>
<td>(IntOpt) Number of ZeroMQ contexts, defaults to 1</td>
<td>(IntOpt) Number of ZeroMQ contexts, defaults to 1.</td>
</tr>
<tr>
<td>rpc_zmq_host = oslo</td>
@ -36,15 +36,15 @@
</tr>
<tr>
<td>rpc_zmq_ipc_dir = /var/run/openstack</td>
<td>(StrOpt) Directory for holding IPC sockets</td>
<td>(StrOpt) Directory for holding IPC sockets.</td>
</tr>
<tr>
<td>rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost</td>
<td>(StrOpt) MatchMaker driver</td>
<td>(StrOpt) MatchMaker driver.</td>
</tr>
<tr>
<td>rpc_zmq_port = 9501</td>
<td>(IntOpt) ZeroMQ receiver listening port</td>
<td>(IntOpt) ZeroMQ receiver listening port.</td>
</tr>
<tr>
<td>rpc_zmq_topic_backlog = None</td>

View File

@ -33,7 +33,9 @@ default_store api
delayed_delete imagecache
disable_process_locking common
enable_v1_api api
enable_v1_registry api
enable_v2_api api
enable_v2_registry api
eventlet_hub wsgi
fake_rabbit rabbitmq
fatal_deprecations logging
@ -55,6 +57,7 @@ instance_format logging
instance_uuid_format logging
key_file ssl
known_stores api
kombu_reconnect_delay rabbitmq
kombu_ssl_ca_certs rabbitmq
kombu_ssl_certfile rabbitmq
kombu_ssl_keyfile rabbitmq
@ -62,11 +65,11 @@ kombu_ssl_version rabbitmq
limit_param_default common
location_strategy api
lock_path common
log-config-append logging
log-date-format logging
log-dir logging
log-file logging
log-format logging
log_config_append logging
log_date_format logging
log_dir logging
log_file logging
log_format logging
logging_context_format_string logging
logging_debug_format_suffix logging
logging_default_format_string logging
@ -104,6 +107,7 @@ qpid_username qpid
rabbit_ha_queues rabbitmq
rabbit_host rabbitmq
rabbit_hosts rabbitmq
rabbit_login_method rabbitmq
rabbit_max_retries rabbitmq
rabbit_password rabbitmq
rabbit_port rabbitmq
@ -168,12 +172,12 @@ swift_store_retry_get_count swift
swift_store_service_type swift
swift_store_ssl_compression swift
swift_store_user swift
syslog-log-facility logging
syslog_log_facility logging
tcp_keepidle wsgi
transport_url amqp
use-syslog logging
use-syslog-rfc-format logging
use_stderr logging
use_syslog logging
use_syslog_rfc_format logging
use_user_token api
user_storage_quota common
verbose logging