Merge "update ceilometer flags and tables"

This commit is contained in:
Jenkins
2014-03-20 18:00:30 +00:00
committed by Gerrit Code Review
20 changed files with 314 additions and 37 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_ceilometer_alarm">
<caption>Description of configuration options for alarm</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_ceilometer_amqp">
<caption>Description of configuration options for amqp</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_ceilometer_api">
<caption>Description of configuration options for api</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_ceilometer_auth">
<caption>Description of configuration options for auth</caption>
<col width="50%"/>
<col width="50%"/>
@@ -22,6 +22,117 @@
<td>auth_strategy = keystone</td>
<td>(StrOpt) The strategy to use for auth: noauth or keystone.</td>
</tr>
<tr>
<th colspan="2">[keystone_authtoken]</th>
</tr>
<tr>
<td>admin_password = None</td>
<td>(StrOpt) Keystone account password</td>
</tr>
<tr>
<td>admin_tenant_name = admin</td>
<td>(StrOpt) Keystone service account tenant name to validate user tokens</td>
</tr>
<tr>
<td>admin_token = None</td>
<td>(StrOpt) Single shared secret with the Keystone configuration used for bootstrapping a Keystone installation, or otherwise bypassing the normal authentication process.</td>
</tr>
<tr>
<td>admin_user = None</td>
<td>(StrOpt) Keystone account username</td>
</tr>
<tr>
<td>auth_admin_prefix = </td>
<td>(StrOpt) Prefix to prepend at the beginning of the path</td>
</tr>
<tr>
<td>auth_host = 127.0.0.1</td>
<td>(StrOpt) Host providing the admin Identity API endpoint</td>
</tr>
<tr>
<td>auth_port = 35357</td>
<td>(IntOpt) Port of the admin Identity API endpoint</td>
</tr>
<tr>
<td>auth_protocol = https</td>
<td>(StrOpt) Protocol of the admin Identity API endpoint(http or https)</td>
</tr>
<tr>
<td>auth_uri = None</td>
<td>(StrOpt) Complete public Identity API endpoint</td>
</tr>
<tr>
<td>auth_version = None</td>
<td>(StrOpt) API version of the admin Identity API endpoint</td>
</tr>
<tr>
<td>cache = None</td>
<td>(StrOpt) Env key for the swift cache</td>
</tr>
<tr>
<td>cafile = None</td>
<td>(StrOpt) A PEM encoded Certificate Authority to use when verifying HTTPs connections. Defaults to system CAs.</td>
</tr>
<tr>
<td>certfile = None</td>
<td>(StrOpt) Required if Keystone server requires client certificate</td>
</tr>
<tr>
<td>delay_auth_decision = False</td>
<td>(BoolOpt) Do not handle authorization requests within the middleware, but delegate the authorization decision to downstream WSGI components</td>
</tr>
<tr>
<td>enforce_token_bind = permissive</td>
<td>(StrOpt) Used to control the use and type of token binding. Can be set to: "disabled" to not check token binding. "permissive" (default) to validate binding information if the bind type is of a form known to the server and ignore it if not. "strict" like "permissive" but if the bind type is unknown the token will be rejected. "required" any form of token binding is needed to be allowed. Finally the name of a binding method that must be present in tokens.</td>
</tr>
<tr>
<td>http_connect_timeout = None</td>
<td>(BoolOpt) Request timeout value for communicating with Identity API server.</td>
</tr>
<tr>
<td>http_handler = None</td>
<td>(StrOpt) Allows to pass in the name of a fake http_handler callback function used instead of httplib.HTTPConnection or httplib.HTTPSConnection. Useful for unit testing where network is not available.</td>
</tr>
<tr>
<td>http_request_max_retries = 3</td>
<td>(IntOpt) How many times are we trying to reconnect when communicating with Identity API Server.</td>
</tr>
<tr>
<td>include_service_catalog = True</td>
<td>(BoolOpt) (optional) indicate whether to set the X-Service-Catalog header. If False, middleware will not ask for service catalog on token validation and will not set the X-Service-Catalog header.</td>
</tr>
<tr>
<td>insecure = False</td>
<td>(BoolOpt) Verify HTTPS connections.</td>
</tr>
<tr>
<td>keyfile = None</td>
<td>(StrOpt) Required if Keystone server requires client certificate</td>
</tr>
<tr>
<td>memcache_secret_key = None</td>
<td>(StrOpt) (optional, mandatory if memcache_security_strategy is defined) this string is used for key derivation.</td>
</tr>
<tr>
<td>memcache_security_strategy = None</td>
<td>(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization.</td>
</tr>
<tr>
<td>memcached_servers = None</td>
<td>(ListOpt) If defined, the memcache server(s) to use for caching</td>
</tr>
<tr>
<td>revocation_cache_time = 1</td>
<td>(IntOpt) Value only used for unit testing</td>
</tr>
<tr>
<td>signing_dir = None</td>
<td>(StrOpt) Directory used to cache files related to PKI tokens</td>
</tr>
<tr>
<td>token_cache_time = 300</td>
<td>(IntOpt) In order to prevent excessive requests and validations, the middleware uses an in-memory cache for the tokens the Keystone API returns. This is only valid if memcache_servers is defined. Set to -1 to disable caching completely.</td>
</tr>
<tr>
<th colspan="2">[service_credentials]</th>
</tr>

View File

@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Warning: Do not edit this file. It is automatically
generated and your changes will be overwritten.
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" xml:id="config_table_ceilometer_cells">
<caption>Description of configuration options for cells</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
<tr>
<th>Configuration option = Default value</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<th colspan="2">[cells]</th>
</tr>
<tr>
<td>bandwidth_update_interval = 600</td>
<td>(IntOpt) Seconds between bandwidth updates for cells.</td>
</tr>
<tr>
<td>call_timeout = 60</td>
<td>(IntOpt) Seconds to wait for response from a call to a cell.</td>
</tr>
<tr>
<td>capabilities = hypervisor=xenserver;kvm, os=linux;windows</td>
<td>(ListOpt) Key/Multi-value list with the capabilities of the cell</td>
</tr>
<tr>
<td>cell_type = compute</td>
<td>(StrOpt) Type of cell: api or compute</td>
</tr>
<tr>
<td>enable = False</td>
<td>(BoolOpt) Enable cell functionality</td>
</tr>
<tr>
<td>manager = nova.cells.manager.CellsManager</td>
<td>(StrOpt) Manager for cells</td>
</tr>
<tr>
<td>mute_child_interval = 300</td>
<td>(IntOpt) Number of seconds after which a lack of capability and capacity updates signals the child cell is to be treated as a mute.</td>
</tr>
<tr>
<td>name = nova</td>
<td>(StrOpt) Name of this cell</td>
</tr>
<tr>
<td>reserve_percent = 10.0</td>
<td>(FloatOpt) Percentage of cell capacity to hold in reserve. Affects both memory and disk utilization</td>
</tr>
<tr>
<td>topic = cells</td>
<td>(StrOpt) The topic cells nodes listen on</td>
</tr>
</tbody>
</table>
</para>

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_ceilometer_collector">
<caption>Description of configuration options for collector</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_ceilometer_common">
<caption>Description of configuration options for common</caption>
<col width="50%"/>
<col width="50%"/>
@@ -34,6 +34,10 @@
<td>lock_path = None</td>
<td>(StrOpt) Directory to use for lock files.</td>
</tr>
<tr>
<td>memcached_servers = None</td>
<td>(ListOpt) Memcached servers or None for in process cache.</td>
</tr>
</tbody>
</table>
</para>

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_ceilometer_database">
<caption>Description of configuration options for database</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_ceilometer_events">
<caption>Description of configuration options for events</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_ceilometer_exchange">
<caption>Description of configuration options for exchange</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_ceilometer_inspector">
<caption>Description of configuration options for inspector</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_ceilometer_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,14 +94,21 @@
<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>
</tr>
<tr>
<th colspan="2">[audit]</th>
</tr>
<tr>
<td>api_audit_map = api_audit_map.conf</td>
<td>(StrOpt) File containing mapping for api paths and service endpoints</td>
</tr>
<tr>
<td>namespace = openstack</td>
<td>(StrOpt) namespace prefix for generated id</td>
</tr>
</tbody>
</table>
</para>

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_ceilometer_qpid">
<caption>Description of configuration options for qpid</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_ceilometer_rabbitmq">
<caption>Description of configuration options for rabbitmq</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_ceilometer_redis">
<caption>Description of configuration options for redis</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_ceilometer_rpc">
<caption>Description of configuration options for rpc</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_ceilometer_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_ceilometer_swift">
<caption>Description of configuration options for swift</caption>
<col width="50%"/>
<col width="50%"/>

View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Warning: Do not edit this file. It is automatically
generated and your changes will be overwritten.
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" xml:id="config_table_ceilometer_vmware">
<caption>Description of configuration options for vmware</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
<tr>
<th>Configuration option = Default value</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<th colspan="2">[vmware]</th>
</tr>
<tr>
<td>api_retry_count = 10</td>
<td>(IntOpt) Number of times a VMware Vsphere API must be retried</td>
</tr>
<tr>
<td>host_ip = </td>
<td>(StrOpt) IP address of the VMware Vsphere host</td>
</tr>
<tr>
<td>host_password = </td>
<td>(StrOpt) Password of VMware Vsphere</td>
</tr>
<tr>
<td>host_username = </td>
<td>(StrOpt) Username of VMware Vsphere</td>
</tr>
<tr>
<td>task_poll_interval = 0.5</td>
<td>(FloatOpt) Sleep time in seconds for polling an ongoing async task</td>
</tr>
</tbody>
</table>
</para>

View File

@@ -29,11 +29,11 @@ kombu_ssl_version rabbitmq
libvirt_type inspector
libvirt_uri inspector
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
@@ -41,6 +41,7 @@ logging_exception_prefix logging
matchmaker_heartbeat_freq redis
matchmaker_heartbeat_ttl redis
max_request_body_size api
memcached_servers common
mysql_engine database
neutron_control_exchange exchange
notification_driver amqp
@@ -89,10 +90,10 @@ rpc_zmq_topic_backlog rpc
sample_source exchange
sqlite_db database
sqlite_synchronous database
syslog-log-facility logging
use-syslog logging
use-syslog-rfc-format logging
syslog_log_facility logging
use_stderr logging
use_syslog logging
use_syslog_rfc_format logging
verbose logging
alarm/evaluation_interval alarm
alarm/evaluation_service alarm
@@ -104,6 +105,18 @@ alarm/rest_notifier_certificate_key alarm
alarm/rest_notifier_ssl_verify alarm
api/host api
api/port api
audit/api_audit_map logging
audit/namespace logging
cells/bandwidth_update_interval cells
cells/call_timeout cells
cells/capabilities cells
cells/cell_type cells
cells/enable cells
cells/manager cells
cells/mute_child_interval cells
cells/name cells
cells/reserve_percent cells
cells/topic cells
collector/udp_address collector
collector/udp_port collector
database/backend database
@@ -124,6 +137,33 @@ dispatcher_file/file_path collector
dispatcher_file/max_bytes collector
event/definitions_cfg_file events
event/drop_unmatched_notifications events
keystone_authtoken/admin_password auth
keystone_authtoken/admin_tenant_name auth
keystone_authtoken/admin_token auth
keystone_authtoken/admin_user auth
keystone_authtoken/auth_admin_prefix auth
keystone_authtoken/auth_host auth
keystone_authtoken/auth_port auth
keystone_authtoken/auth_protocol auth
keystone_authtoken/auth_uri auth
keystone_authtoken/auth_version auth
keystone_authtoken/cache auth
keystone_authtoken/cafile auth
keystone_authtoken/certfile auth
keystone_authtoken/delay_auth_decision auth
keystone_authtoken/enforce_token_bind auth
keystone_authtoken/http_connect_timeout auth
keystone_authtoken/http_handler auth
keystone_authtoken/http_request_max_retries auth
keystone_authtoken/include_service_catalog auth
keystone_authtoken/insecure auth
keystone_authtoken/keyfile auth
keystone_authtoken/memcache_secret_key auth
keystone_authtoken/memcache_security_strategy auth
keystone_authtoken/memcached_servers auth
keystone_authtoken/revocation_cache_time auth
keystone_authtoken/signing_dir auth
keystone_authtoken/token_cache_time auth
matchmaker_redis/host redis
matchmaker_redis/password redis
matchmaker_redis/port redis
@@ -134,14 +174,19 @@ publisher/metering_secret rpc
publisher_rpc/metering_topic rpc
rpc_notifier2/topics rpc
service_credentials/insecure auth
service_credentials/os-auth-url auth
service_credentials/os-cacert auth
service_credentials/os-endpoint-type auth
service_credentials/os-password auth
service_credentials/os-region-name auth
service_credentials/os-tenant-id auth
service_credentials/os-tenant-name auth
service_credentials/os-username auth
service_credentials/os_auth_url auth
service_credentials/os_cacert auth
service_credentials/os_endpoint_type auth
service_credentials/os_password auth
service_credentials/os_region_name auth
service_credentials/os_tenant_id auth
service_credentials/os_tenant_name auth
service_credentials/os_username auth
ssl/ca_file ssl
ssl/cert_file ssl
ssl/key_file ssl
vmware/api_retry_count vmware
vmware/host_ip vmware
vmware/host_password vmware
vmware/host_username vmware
vmware/task_poll_interval vmware