openstack/openstack-manuals
Code Issues Proposed changes

Unify option tables a bit

Browse Source 
This unifies some placement of entries into tables accross projects:

glance, trove, neutron, keystone, cinder: Changed ssl to ca.
Move debug to debug if such a table exists (ceilometer).
Move default_log_levels to logging.
Create logging section everywhere and unify content.
Move fatal_deprecations to logging.
Move host to common.
Move lock_path to common.

Change-Id: I461f90a7d6b05aa5c113244c978c933039dde08c
Partial-Bug: #1363485
This commit is contained in:
Andreas Jaeger 2014-08-30 21:15:56 +02:00
parent 5ed518afe3
commit a6fe27232f
34 changed files with 240 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/common/tables/ceilometer-common.xml
View File

@ -26,8 +26,8 @@
<td>(BoolOpt) Enables or disables inter-process locks.</td>
</tr>
<tr>
<td>fatal_deprecations = False</td>
<td>(BoolOpt) Enables or disables fatal status of deprecations.</td>
<td>host = localhost</td>
<td>(StrOpt) Name of this node, which must be valid in an AMQP key. Can be an opaque identifier. For ZeroMQ only, must be a valid host name, FQDN, or IP address.</td>
</tr>
<tr>
<td>lock_path = None</td>

4
doc/common/tables/ceilometer-debug.xml
View File

@ -17,6 +17,10 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>debug = False</td>
<td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level).</td>
</tr>
<tr>
<td>nova_http_log_debug = False</td>
<td>(BoolOpt) Allow novaclient's debug log output.</td>

8
doc/common/tables/ceilometer-logging.xml
View File

@ -17,14 +17,14 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>debug = False</td>
<td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level).</td>
</tr>
<tr>
<td>default_log_levels = 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</td>
<td>(ListOpt) List of logger=LEVEL pairs.</td>
</tr>
<tr>
<td>fatal_deprecations = False</td>
<td>(BoolOpt) Enables or disables fatal status of deprecations.</td>
</tr>
<tr>
<td>instance_format = "[instance: %(uuid)s] "</td>
<td>(StrOpt) The format for an instance that is passed with the log message.</td>

4
doc/common/tables/ceilometer-redis.xml
View File

@ -17,10 +17,6 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>host = localhost</td>
<td>(StrOpt) Name of this node, which must be valid in an AMQP key. Can be an opaque identifier. For ZeroMQ only, must be a valid host name, FQDN, or IP address.</td>
</tr>
<tr>
<td>matchmaker_heartbeat_freq = 300</td>
<td>(IntOpt) Heartbeat frequency.</td>

4
doc/common/tables/neutron-ssl.xml → doc/common/tables/cinder-ca.xml
View File

@ -3,8 +3,8 @@
<!-- Warning: Do not edit this file. It is automatically
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_neutron_ssl">
<caption>Description of SSL configuration options</caption>
<table rules="all" xml:id="config_table_cinder_ca">
<caption>Description of CA and SSL configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

80
doc/common/tables/cinder-common.xml
View File

@ -25,18 +25,10 @@
<td>consistencygroup_api_class = cinder.consistencygroup.api.API</td>
<td>(StrOpt) The full class name of the consistencygroup API class</td>
</tr>
<tr>
<td>debug = False</td>
<td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level).</td>
</tr>
<tr>
<td>default_availability_zone = None</td>
<td>(StrOpt) Default availability zone for new volumes. If not set, the storage_availability_zone option value is used as the default for new volumes.</td>
</tr>
<tr>
<td>default_log_levels = 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</td>
<td>(ListOpt) List of logger=LEVEL pairs.</td>
</tr>
<tr>
<td>default_volume_type = None</td>
<td>(StrOpt) Default volume type to use</td>
@ -49,14 +41,6 @@
<td>enable_new_services = True</td>
<td>(BoolOpt) Services to be added to the available pool on create</td>
</tr>
<tr>
<td>fatal_deprecations = False</td>
<td>(BoolOpt) Enables or disables fatal status of deprecations.</td>
</tr>
<tr>
<td>fatal_exception_format_errors = False</td>
<td>(BoolOpt) Make exception message format errors fatal.</td>
</tr>
<tr>
<td>host = localhost</td>
<td>(StrOpt) Name of this node. This can be an opaque identifier. It is not necessarily a host name, FQDN, or IP address.</td>
@ -73,42 +57,6 @@
<td>lock_path = None</td>
<td>(StrOpt) Directory to use for lock files. Default to a temp directory</td>
</tr>
<tr>
<td>log_config_append = None</td>
<td>(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.</td>
</tr>
<tr>
<td>log_date_format = %Y-%m-%d %H:%M:%S</td>
<td>(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s .</td>
</tr>
<tr>
<td>log_dir = None</td>
<td>(StrOpt) (Optional) The base directory used for relative --log-file paths.</td>
</tr>
<tr>
<td>log_file = None</td>
<td>(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout.</td>
</tr>
<tr>
<td>log_format = None</td>
<td>(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.</td>
</tr>
<tr>
<td>logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s</td>
<td>(StrOpt) Format string to use for log messages with context.</td>
</tr>
<tr>
<td>logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d</td>
<td>(StrOpt) Data to append to log format when level is DEBUG.</td>
</tr>
<tr>
<td>logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s</td>
<td>(StrOpt) Format string to use for log messages without context.</td>
</tr>
<tr>
<td>logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s</td>
<td>(StrOpt) Prefix each line of exception output with this format.</td>
</tr>
<tr>
<td>monkey_patch = False</td>
<td>(BoolOpt) Enable monkey patching</td>
@ -169,18 +117,6 @@
<td>service_down_time = 60</td>
<td>(IntOpt) Maximum time since last check-in for a service to be considered up</td>
</tr>
<tr>
<td>ssl_ca_file = None</td>
<td>(StrOpt) CA certificate file to use to verify connecting clients</td>
</tr>
<tr>
<td>ssl_cert_file = None</td>
<td>(StrOpt) Certificate file to use when starting the server securely</td>
</tr>
<tr>
<td>ssl_key_file = None</td>
<td>(StrOpt) Private key file to use when starting the server securely</td>
</tr>
<tr>
<td>state_path = /var/lib/cinder</td>
<td>(StrOpt) Top-level directory for maintaining cinder's state</td>
@ -189,10 +125,6 @@
<td>storage_availability_zone = nova</td>
<td>(StrOpt) Availability zone of this node</td>
</tr>
<tr>
<td>syslog_log_facility = LOG_USER</td>
<td>(StrOpt) Syslog facility to receive log lines.</td>
</tr>
<tr>
<td>tcp_keepalive = True</td>
<td>(BoolOpt) Sets the value of TCP_KEEPALIVE (True/False) for each server socket.</td>
@ -221,18 +153,6 @@
<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 will change in J to honor RFC5424.</td>
</tr>
<tr>
<td>use_syslog_rfc_format = False</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>
</tr>
<tr>
<td>verbose = False</td>
<td>(BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level).</td>
</tr>
</tbody>
</table>
</para>

8
doc/common/tables/cinder-images.xml
View File

@ -61,14 +61,6 @@
<td>image_conversion_dir = $state_path/conversion</td>
<td>(StrOpt) Directory used for temporary storage during image conversion</td>
</tr>
<tr>
<td>instance_format = "[instance: %(uuid)s] "</td>
<td>(StrOpt) The format for an instance that is passed with the log message.</td>
</tr>
<tr>
<td>instance_uuid_format = "[instance: %(uuid)s] "</td>
<td>(StrOpt) The format for an instance UUID that is passed with the log message.</td>
</tr>
<tr>
<td>use_multipath_for_image_xfer = False</td>
<td>(BoolOpt) Do we attach/detach volumes in cinder using multipath for volume to image and image to volume transfers?</td>

102
doc/common/tables/cinder-logging.xml Normal file
View File

@ -0,0 +1,102 @@
<?xml version='1.0' encoding='UTF-8'?>
<para xmlns="http://docbook.org/ns/docbook" version="5.0">
<!-- Warning: Do not edit this file. It is automatically
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_cinder_logging">
<caption>Description of logging configuration options</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">[DEFAULT]</th>
</tr>
<tr>
<td>debug = False</td>
<td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level).</td>
</tr>
<tr>
<td>default_log_levels = 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</td>
<td>(ListOpt) List of logger=LEVEL pairs.</td>
</tr>
<tr>
<td>fatal_deprecations = False</td>
<td>(BoolOpt) Enables or disables fatal status of deprecations.</td>
</tr>
<tr>
<td>fatal_exception_format_errors = False</td>
<td>(BoolOpt) Make exception message format errors fatal.</td>
</tr>
<tr>
<td>instance_format = "[instance: %(uuid)s] "</td>
<td>(StrOpt) The format for an instance that is passed with the log message.</td>
</tr>
<tr>
<td>instance_uuid_format = "[instance: %(uuid)s] "</td>
<td>(StrOpt) The format for an instance UUID that is passed with the log message.</td>
</tr>
<tr>
<td>log_config_append = None</td>
<td>(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.</td>
</tr>
<tr>
<td>log_date_format = %Y-%m-%d %H:%M:%S</td>
<td>(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s .</td>
</tr>
<tr>
<td>log_dir = None</td>
<td>(StrOpt) (Optional) The base directory used for relative --log-file paths.</td>
</tr>
<tr>
<td>log_file = None</td>
<td>(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout.</td>
</tr>
<tr>
<td>log_format = None</td>
<td>(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.</td>
</tr>
<tr>
<td>logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s</td>
<td>(StrOpt) Format string to use for log messages with context.</td>
</tr>
<tr>
<td>logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d</td>
<td>(StrOpt) Data to append to log format when level is DEBUG.</td>
</tr>
<tr>
<td>logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s</td>
<td>(StrOpt) Format string to use for log messages without context.</td>
</tr>
<tr>
<td>logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s</td>
<td>(StrOpt) Prefix each line of exception output with this format.</td>
</tr>
<tr>
<td>publish_errors = False</td>
<td>(BoolOpt) Enables or disables publication of error events.</td>
</tr>
<tr>
<td>syslog_log_facility = LOG_USER</td>
<td>(StrOpt) Syslog facility to receive log lines.</td>
</tr>
<tr>
<td>use_syslog = False</td>
<td>(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424.</td>
</tr>
<tr>
<td>use_syslog_rfc_format = False</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>
</tr>
<tr>
<td>verbose = False</td>
<td>(BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level).</td>
</tr>
</tbody>
</table>
</para>

4
doc/common/tables/cinder-rpc.xml
View File

@ -73,10 +73,6 @@
<td>notification_topics = notifications</td>
<td>(ListOpt) AMQP topic used for OpenStack notifications.</td>
</tr>
<tr>
<td>publish_errors = False</td>
<td>(BoolOpt) Enables or disables publication of error events.</td>
</tr>
<tr>
<td>qpid_heartbeat = 60</td>
<td>(IntOpt) Seconds between connection keepalive heartbeats.</td>

4
doc/common/tables/glance-ssl.xml → doc/common/tables/glance-ca.xml
View File

@ -3,8 +3,8 @@
<!-- Warning: Do not edit this file. It is automatically
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_glance_ssl">
<caption>Description of SSL configuration options</caption>
<table rules="all" xml:id="config_table_glance_ca">
<caption>Description of CA and SSL configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

8
doc/common/tables/heat-common.xml
View File

@ -29,6 +29,10 @@
<td>event_purge_batch_size = 10</td>
<td>(IntOpt) Controls how many events will be pruned whenever a stack's events exceed max_events_per_stack. Set this lower to keep more events at the expense of more frequent purges.</td>
</tr>
<tr>
<td>host = localhost</td>
<td>(StrOpt) Name of the engine node. This can be an opaque identifier. It is not necessarily a hostname, FQDN, or IP address.</td>
</tr>
<tr>
<td>instance_driver = heat.engine.nova</td>
<td>(StrOpt) Driver to use for controlling instances.</td>
@ -41,6 +45,10 @@
<td>keystone_backend = heat.common.heat_keystoneclient.KeystoneClientV3</td>
<td>(StrOpt) Fully qualified class name to use as a keystone backend.</td>
</tr>
<tr>
<td>lock_path = None</td>
<td>(StrOpt) Directory to use for lock files.</td>
</tr>
<tr>
<td>networking_service = None</td>
<td>(StrOpt) Select OpenStack component responsible for networking - nova or neutron.</td>

8
doc/common/tables/heat-debug.xml
View File

@ -29,14 +29,6 @@
<td>disable_process_locking = False</td>
<td>(BoolOpt) Enables or disables inter-process locks.</td>
</tr>
<tr>
<td>fatal_deprecations = False</td>
<td>(BoolOpt) Enables or disables fatal status of deprecations.</td>
</tr>
<tr>
<td>lock_path = None</td>
<td>(StrOpt) Directory to use for lock files.</td>
</tr>
</tbody>
</table>
</para>

4
doc/common/tables/heat-logging.xml
View File

@ -21,6 +21,10 @@
<td>default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN</td>
<td>(ListOpt) List of logger=LEVEL pairs.</td>
</tr>
<tr>
<td>fatal_deprecations = False</td>
<td>(BoolOpt) Enables or disables fatal status of deprecations.</td>
</tr>
<tr>
<td>instance_format = "[instance: %(uuid)s] "</td>
<td>(StrOpt) The format for an instance that is passed with the log message.</td>

7
doc/common/tables/heat-redis.xml
View File

@ -14,13 +14,6 @@
</tr>
</thead>
<tbody>
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>host = localhost</td>
<td>(StrOpt) Name of the engine node. This can be an opaque identifier. It is not necessarily a hostname, FQDN, or IP address.</td>
</tr>
<tr>
<th colspan="2">[matchmaker_redis]</th>
</tr>

19
doc/common/tables/trove-ssl.xml → doc/common/tables/neutron-ca.xml
View File

@ -3,8 +3,8 @@
<!-- Warning: Do not edit this file. It is automatically
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_trove_ssl">
<caption>Description of SSL configuration options</caption>
<table rules="all" xml:id="config_table_neutron_ca">
<caption>Description of CA and SSL configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
@ -14,6 +14,21 @@
</tr>
</thead>
<tbody>
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>ssl_ca_file = None</td>
<td>(StrOpt) CA certificate file to use to verify connecting clients</td>
</tr>
<tr>
<td>ssl_cert_file = None</td>
<td>(StrOpt) Certificate file to use when starting the server securely</td>
</tr>
<tr>
<td>ssl_key_file = None</td>
<td>(StrOpt) Private key file to use when starting the server securely</td>
</tr>
<tr>
<th colspan="2">[ssl]</th>
</tr>

4
doc/common/tables/neutron-common.xml
View File

@ -125,6 +125,10 @@
<td>force_gateway_on_subnet = True</td>
<td>(BoolOpt) Ensure that configured gateway is on subnet. For IPv6, validate only if gateway is not a link local address. Deprecated, to be removed during the K release, at which point the check will be mandatory.</td>
</tr>
<tr>
<td>host = localhost</td>
<td>(StrOpt) The hostname Neutron is running on</td>
</tr>
<tr>
<td>interface_driver = None</td>
<td>(StrOpt) The driver used to manage the virtual interface.</td>

7
doc/common/tables/neutron-redis.xml
View File

@ -14,13 +14,6 @@
</tr>
</thead>
<tbody>
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>host = localhost</td>
<td>(StrOpt) The hostname Neutron is running on</td>
</tr>
<tr>
<th colspan="2">[matchmaker_redis]</th>
</tr>

4
doc/common/tables/cinder-ssl.xml → doc/common/tables/trove-ca.xml
View File

@ -3,8 +3,8 @@
<!-- Warning: Do not edit this file. It is automatically
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
<table rules="all" xml:id="config_table_cinder_ssl">
<caption>Description of SSL configuration options</caption>
<table rules="all" xml:id="config_table_trove_ca">
<caption>Description of CA and SSL configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>

8
doc/common/tables/trove-common.xml
View File

@ -29,10 +29,6 @@
<td>default_datastore = None</td>
<td>(StrOpt) The default datastore id or name to use if one is not provided by the user. If the default value is None, the field becomes required in the instance-create request.</td>
</tr>
<tr>
<td>default_log_levels = 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</td>
<td>(ListOpt) List of logger=LEVEL pairs.</td>
</tr>
<tr>
<td>default_neutron_networks = </td>
<td>(ListOpt) List of IDs for management networks which should be attached to the instance regardless of what NICs are specified in the create API call.</td>
@ -53,6 +49,10 @@
<td>expected_filetype_suffixes = json</td>
<td>(ListOpt) Filetype endings not to be reattached to an ID by the utils method correct_id_with_req.</td>
</tr>
<tr>
<td>host = 0.0.0.0</td>
<td>(StrOpt) No help text available for this option.</td>
</tr>
<tr>
<td>lock_path = None</td>
<td>(StrOpt) Directory to use for lock files.</td>

8
doc/common/tables/trove-debug.xml
View File

@ -33,10 +33,6 @@
<td>disable_process_locking = False</td>
<td>(BoolOpt) Whether to disable inter-process locks</td>
</tr>
<tr>
<td>fatal_deprecations = False</td>
<td>(BoolOpt) Enables or disables fatal status of deprecations.</td>
</tr>
<tr>
<td>pydev_debug = disabled</td>
<td>(StrOpt) Enable or disable pydev remote debugging. If value is 'auto' tries to connect to remote debugger server, but in case of error continues running with debugging disabled.</td>
@ -49,10 +45,6 @@
<td>pydev_debug_port = None</td>
<td>(IntOpt) Pydev debug server port (5678 by default).</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>
</tbody>
</table>
</para>

12
doc/common/tables/trove-logging.xml
View File

@ -17,6 +17,14 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>default_log_levels = 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</td>
<td>(ListOpt) List of logger=LEVEL pairs.</td>
</tr>
<tr>
<td>fatal_deprecations = False</td>
<td>(BoolOpt) Enables or disables fatal status of deprecations.</td>
</tr>
<tr>
<td>format_options = -m 5</td>
<td>(StrOpt) No help text available for this option.</td>
@ -89,6 +97,10 @@
<td>use_syslog_rfc_format = False</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>
</tr>
<tr>
<td>verbose = False</td>
<td>(BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level).</td>
</tr>
</tbody>
</table>
</para>

4
doc/common/tables/trove-rpc.xml
View File

@ -21,10 +21,6 @@
<td>allowed_rpc_exception_modules = nova.exception, cinder.exception, exceptions</td>
<td>(ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call.</td>
</tr>
<tr>
<td>host = 0.0.0.0</td>
<td>(StrOpt) No help text available for this option.</td>
</tr>
<tr>
<td>matchmaker_heartbeat_freq = 300</td>
<td>(IntOpt) Heartbeat frequency</td>

3
doc/config-reference/block-storage/section_misc.xml
View File

@ -23,7 +23,7 @@
<xi:include href="../../common/tables/cinder-rpc.xml"/>
<xi:include href="../../common/tables/cinder-san-solaris.xml"/>
<xi:include href="../../common/tables/cinder-rootwrap.xml"/>
<xi:include href="../../common/tables/cinder-ssl.xml"/>
<xi:include href="../../common/tables/cinder-ca.xml"/>
<xi:include href="../../common/tables/cinder-images.xml"/>
<xi:include href="../../common/tables/cinder-swift.xml"/>
<xi:include href="../../common/tables/cinder-emc.xml"/>
@ -41,4 +41,5 @@
<xi:include href="../../common/tables/cinder-scheduler.xml"/>
<xi:include href="../../common/tables/cinder-quota.xml"/>
<xi:include href="../../common/tables/cinder-common.xml"/>
<xi:include href="../../common/tables/cinder-logging.xml"/>
</section>

2
doc/config-reference/ch_databaseserviceconfigure.xml
View File

@ -15,6 +15,7 @@
<xi:include href="../common/tables/trove-api.xml"/>
<xi:include href="../common/tables/trove-auth_token.xml"/>
<xi:include href="../common/tables/trove-backup.xml"/>
<xi:include href="../common/tables/trove-ca.xml"/>
<xi:include href="../common/tables/trove-clients.xml"/>
<xi:include href="../common/tables/trove-common.xml"/>
<xi:include href="../common/tables/trove-compute.xml"/>
@ -27,7 +28,6 @@
<xi:include href="../common/tables/trove-nova.xml"/>
<xi:include href="../common/tables/trove-quota.xml"/>
<xi:include href="../common/tables/trove-redis.xml"/>
<xi:include href="../common/tables/trove-ssl.xml"/>
<xi:include href="../common/tables/trove-swift.xml"/>
<xi:include href="../common/tables/trove-taskmanager.xml"/>
<xi:include href="../common/tables/trove-volume.xml"/>

2
doc/config-reference/image-service/section_image-service-api.xml
View File

@ -18,6 +18,6 @@
<para>Tables of all the options used to configure the APIs, including enabling
SSL and modifying WSGI settings are found below.</para>
<xi:include href="../../common/tables/glance-api.xml"/>
<xi:include href="../../common/tables/glance-ssl.xml"/>
<xi:include href="../../common/tables/glance-ca.xml"/>
<xi:include href="../../common/tables/glance-wsgi.xml"/>
</section>

4
doc/config-reference/networking/section_networking-options-reference.xml
View File

@ -151,10 +151,10 @@ for your driver to change security group settings.</para>
</section>
<section xml:id="networking-options-ssl">
<title>SSL</title>
<title>SSL and Certification Authority</title>
<para>Use the following options in the
<filename>neutron.conf</filename> file to enable SSL.</para>
<xi:include href="../../common/tables/neutron-ssl.xml"/>
<xi:include href="../../common/tables/neutron-ca.xml"/>
</section>
<section xml:id="networking-options-testing">

6
tools/autogenerate-config-flagmappings/ceilometer.flagmappings
View File

@ -6,16 +6,16 @@ cinder_control_exchange exchange
collector_workers collector
control_exchange exchange
database_connection database
debug logging
debug debug
default_log_levels logging
disable_process_locking common
dispatcher rpc
fake_rabbit rabbitmq
fatal_deprecations common
fatal_deprecations logging
glance_control_exchange exchange
glance_page_size glance
heat_control_exchange exchange
host redis
host common
http_control_exchanges exchange
hypervisor_inspector inspector
instance_format logging

52
tools/autogenerate-config-flagmappings/cinder.flagmappings
View File

@ -48,9 +48,9 @@ coraid_repository_key coraid
coraid_user coraid
db_backend database
db_driver database
debug common
debug logging
default_availability_zone common
default_log_levels common
default_log_levels logging
default_timeout rpc
default_volume_type common
destroy_empty_storage_group emc
@ -71,8 +71,8 @@ eqlx_use_chap eqlx
expiry_thres_minutes netapp_7mode_nfs netapp_cdot_nfs
extra_capabilities api
fake_rabbit rpc
fatal_deprecations common
fatal_exception_format_errors common
fatal_deprecations logging
fatal_exception_format_errors logging
glance_api_insecure images
glance_api_servers images
glance_api_ssl_compression images
@ -115,8 +115,8 @@ hplefthand_username hplefthand
iet_conf common
image_conversion_dir images
initiator_auto_registration emc
instance_format images
instance_uuid_format images
instance_format logging
instance_uuid_format logging
iscsi_helper storage
iscsi_initiators emc
iscsi_iotype storage
@ -137,15 +137,15 @@ kombu_ssl_keyfile rpc
kombu_ssl_version rpc
lio_initiator_iqns common
lock_path common
log_config_append common
log_date_format common
log_dir common
log_file common
log_format common
logging_context_format_string common
logging_debug_format_suffix common
logging_default_format_string common
logging_exception_prefix common
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
logging_exception_prefix logging
lvm_mirrors lvm
lvm_type lvm
matchmaker_heartbeat_freq rpc
@ -234,7 +234,7 @@ periodic_fuzzy_delay common
periodic_interval common
policy_default_rule common
policy_file common
publish_errors rpc
publish_errors logging
pure_api_token pure
qpid_heartbeat rpc
qpid_hostname rpc
@ -321,9 +321,9 @@ snapshot_same_host backups
ssh_conn_timeout san
ssh_max_pool_conn san
ssh_min_pool_conn san
ssl_ca_file common
ssl_cert_file common
ssl_key_file common
ssl_ca_file ca
ssl_cert_file ca
ssl_key_file ca
state_path common
storage_availability_zone common
storage_vnx_authentication_type emc
@ -343,7 +343,7 @@ storwize_svc_vol_iogrp storwize
storwize_svc_vol_rsize storwize
storwize_svc_vol_warning storwize
storwize_svc_volpool_name storwize
syslog_log_facility common
syslog_log_facility logging
tcp_keepalive common
tcp_keepalive_count common
tcp_keepalive_interval common
@ -357,9 +357,9 @@ use_default_quota_class quota
use_forwarded_for common
use_multipath_for_image_xfer images
use_stderr common
use_syslog common
use_syslog_rfc_format common
verbose common
use_syslog logging
use_syslog_rfc_format logging
verbose logging
vmware_api_retry_count vmware
vmware_host_ip vmware
vmware_host_password vmware
@ -498,6 +498,6 @@ matchmaker_redis/host rpc
matchmaker_redis/password rpc
matchmaker_redis/port rpc
matchmaker_ring/ringfile rpc
ssl/ca_file ssl
ssl/cert_file ssl
ssl/key_file ssl
ssl/ca_file ca
ssl/cert_file ca
ssl/key_file ca

6
tools/autogenerate-config-flagmappings/glance.flagmappings
View File

@ -14,8 +14,8 @@ auth_url registry
backlog common
bind_host common
bind_port common
ca_file ssl
cert_file ssl
ca_file ca
cert_file ca
cinder_api_insecure cinder
cinder_ca_certificates_file cinder
cinder_catalog_info cinder
@ -54,7 +54,7 @@ image_size_cap api
image_tag_quota common
instance_format logging
instance_uuid_format logging
key_file ssl
key_file ca
known_stores api
kombu_reconnect_delay rabbitmq
kombu_ssl_ca_certs rabbitmq

6
tools/autogenerate-config-flagmappings/heat.flagmappings
View File

@ -15,12 +15,12 @@ engine_life_check_timeout rpc
environment_dir common
event_purge_batch_size common
fake_rabbit amqp
fatal_deprecations debug
fatal_deprecations logging
heat_metadata_server_url api metadata_api
heat_stack_user_role api
heat_waitcondition_server_url api waitcondition_api
heat_watch_server_url api cloudwatch_api
host redis
host common
instance_connection_https_validate_certificates cfn_api
instance_connection_is_secure cfn_api
instance_driver common
@ -35,7 +35,7 @@ kombu_ssl_keyfile rabbitmq
kombu_ssl_version rabbitmq
list_notifier_drivers amqp
loadbalancer_template loadbalancer
lock_path debug
lock_path common
log_config_append logging
log_date_format logging
log_dir logging

34
tools/autogenerate-config-flagmappings/keystone.flagmappings
View File

@ -288,23 +288,23 @@ policy/list_limit policy
revoke/caching revoke
revoke/driver revoke
revoke/expiration_buffer revoke
signing/ca_certs ssl
signing/ca_key ssl
signing/cert_subject ssl
signing/certfile ssl
signing/key_size ssl
signing/keyfile ssl
signing/token_format ssl
signing/valid_days ssl
ssl/ca_certs ssl
ssl/ca_key ssl
ssl/cert_required ssl
ssl/cert_subject ssl
ssl/certfile ssl
ssl/enable ssl
ssl/key_size ssl
ssl/keyfile ssl
ssl/valid_days ssl
signing/ca_certs ca
signing/ca_key ca
signing/cert_subject ca
signing/certfile ca
signing/key_size ca
signing/keyfile ca
signing/token_format ca
signing/valid_days ca
ssl/ca_certs ca
ssl/ca_key ca
ssl/cert_required ca
ssl/cert_subject ca
ssl/certfile ca
ssl/enable ca
ssl/key_size ca
ssl/keyfile ca
ssl/valid_days ca
stats/driver stats
token/bind token
token/cache_time token

14
tools/autogenerate-config-flagmappings/neutron.flagmappings
View File

@ -61,7 +61,7 @@ fatal_deprecations logging
force_gateway_on_subnet common
gateway_external_network_id l3_agent
handle_internal_only_routers l3_agent
host redis
host common
hosting_device_dead_timeout cfg_agent
http_timeout vmware
instance_format logging
@ -191,9 +191,9 @@ run_external_periodic_tasks api
send_arp_for_ha l3_agent
send_events_interval compute
service_plugins api
ssl_ca_file ssl
ssl_cert_file ssl
ssl_key_file ssl
ssl_ca_file ca
ssl_cert_file ca
ssl_key_file ca
state_path common
syslog_log_facility logging
tcp_keepidle wsgi
@ -623,9 +623,9 @@ radware/vdirect_address lbaas_radware
radware/vdirect_password lbaas_radware
radware/vdirect_user lbaas_radware
service_providers/service_provider api
ssl/ca_file ssl
ssl/cert_file ssl
ssl/key_file ssl
ssl/ca_file ca
ssl/cert_file ca
ssl/key_file ca
vArmour/director varmour
vArmour/director_port varmour
vArmour/password varmour

2
tools/autogenerate-config-flagmappings/shared.headers
View File

@ -2,6 +2,7 @@ amqp AMQP
api API
auth authorization
auth_token authorization token
ca CA and SSL
cinder cinder
clients clients
common common
@ -20,7 +21,6 @@ rabbitmq RabbitMQ
redis Redis
rpc RPC
scheduler scheduler
ssl SSL
swift swift
testing testing
tripleo TripleO

14
tools/autogenerate-config-flagmappings/trove.flagmappings
View File

@ -39,7 +39,7 @@ datastore_registry_ext taskmanager
db_api_implementation api
debug debug
default_datastore common
default_log_levels common
default_log_levels logging
default_neutron_networks common
default_notification_level common
default_password_length common
@ -65,14 +65,14 @@ exists_notification_ticks taskmanager
exists_notification_transformer taskmanager
expected_filetype_suffixes common
fake_rabbit amqp
fatal_deprecations debug
fatal_deprecations logging
format_options logging
guest_config guestagent
guest_id guestagent
heat_service_type heat
heat_time_out heat
heat_url heat
host rpc
host common
hostname_require_ipv4 api
http_delete_rate api
http_get_rate api
@ -209,7 +209,7 @@ use_stderr logging
use_syslog logging
use_syslog_rfc_format logging
users_page_size api
verbose debug
verbose logging
verify_swift_checksum_on_restore taskmanager
volume_format_timeout volume
volume_fstype volume
@ -313,6 +313,6 @@ secure_messages/enforced rpc
secure_messages/kds_endpoint rpc
secure_messages/secret_key rpc
secure_messages/secret_keys_file rpc
ssl/ca_file ssl
ssl/cert_file ssl
ssl/key_file ssl
ssl/ca_file ca
ssl/cert_file ca
ssl/key_file ca