openstack
/
openstack-manuals
Code Issues Proposed changes

[config-ref] Heat option tables update 

Change-Id: I4dd0de430dc099eaa5e1271f0ff15ad40919fadc
This commit is contained in:
Gauvain Pocentek 2015-07-19 12:33:04 +02:00
parent a6dd7ad60f
commit 725328e106
17 changed files with 221 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/common/tables/heat-amqp.xml
View File

@ -29,13 +29,9 @@
<td><option>default_publisher_id</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Default publisher_id for outgoing notifications.</td>
</tr>
<tr>
<td><option>list_notifier_drivers</option> = <replaceable>None</replaceable></td>
<td>(MultiStrOpt) List of drivers to send notifications (DEPRECATED).</td>
</tr>
<tr>
<td><option>notification_driver</option> = <replaceable>[]</replaceable></td>
<td>(MultiStrOpt) Driver or drivers to handle sending notifications.</td>
<td>(MultiStrOpt) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing, log, test, noop</td>
</tr>
<tr>
<td><option>notification_topics</option> = <replaceable>notifications</replaceable></td>

72
doc/common/tables/heat-api.xml
View File

@ -29,6 +29,10 @@
<td><option>enable_stack_adopt</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Enable the preview Stack Adopt feature.</td>
</tr>
<tr>
<td><option>encrypt_parameters_and_properties</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Encrypt template parameters that were marked as hidden and also all the resource properties before storing them in database.</td>
</tr>
<tr>
<td><option>heat_metadata_server_url</option> = <replaceable></replaceable></td>
<td>(StrOpt) URL of the Heat metadata server.</td>
@ -38,13 +42,17 @@
<td>(StrOpt) Keystone role for heat template-defined users.</td>
</tr>
<tr>
<td><option>heat_waitcondition_server_url</option> = <replaceable></replaceable></td>
<td><option>heat_waitcondition_server_url</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) URL of the Heat waitcondition server.</td>
</tr>
<tr>
<td><option>heat_watch_server_url</option> = <replaceable></replaceable></td>
<td>(StrOpt) URL of the Heat CloudWatch server.</td>
</tr>
<tr>
<td><option>hidden_stack_tags</option> = <replaceable></replaceable></td>
<td>(ListOpt) Stacks containing these tag names will be hidden. Multiple tags should be given in a comma-delimited list (eg. hidden_stack_tags=hide_me,me_too).</td>
</tr>
<tr>
<td><option>max_json_body_size</option> = <replaceable>1048576</replaceable></td>
<td>(IntOpt) Maximum raw byte size of JSON request body. Should be larger than max_template_size.</td>
@ -53,18 +61,6 @@
<td><option>num_engine_workers</option> = <replaceable>4</replaceable></td>
<td>(IntOpt) Number of heat-engine processes to fork and run.</td>
</tr>
<tr>
<td><option>policy_default_rule</option> = <replaceable>default</replaceable></td>
<td>(StrOpt) Default rule. Enforced when a requested rule is not found.</td>
</tr>
<tr>
<td><option>policy_dirs</option> = <replaceable>['policy.d']</replaceable></td>
<td>(MultiStrOpt) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched.</td>
</tr>
<tr>
<td><option>policy_file</option> = <replaceable>policy.json</replaceable></td>
<td>(StrOpt) The JSON file that defines policies.</td>
</tr>
<tr>
<td><option>secure_proxy_ssl_header</option> = <replaceable>X-Forwarded-Proto</replaceable></td>
<td>(StrOpt) The HTTP Header that will be used to determine which the original request protocol scheme was, even if it was removed by an SSL terminator proxy.</td>
@ -139,6 +135,17 @@
<td><option>multi_cloud</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Allow orchestration of multiple clouds.</td>
</tr>
<tr>
<th colspan="2">[eventlet_opts]</th>
</tr>
<tr>
<td><option>client_socket_timeout</option> = <replaceable>900</replaceable></td>
<td>(IntOpt) Timeout for client connections' socket operations. If an incoming connection is idle for this number of seconds it will be closed. A value of '0' means wait forever.</td>
</tr>
<tr>
<td><option>wsgi_keep_alive</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) If False, closes the client socket connection explicitly.</td>
</tr>
<tr>
<th colspan="2">[heat_api]</th>
</tr>
@ -167,9 +174,46 @@
<td>(IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs).</td>
</tr>
<tr>
<td><option>workers</option> = <replaceable>0</replaceable></td>
<td><option>tcp_keepidle</option> = <replaceable>600</replaceable></td>
<td>(IntOpt) The value for the socket option TCP_KEEPIDLE. This is the time in seconds that the connection must be idle before TCP starts sending keepalive probes.</td>
</tr>
<tr>
<td><option>workers</option> = <replaceable>4</replaceable></td>
<td>(IntOpt) Number of workers for Heat service.</td>
</tr>
<tr>
<th colspan="2">[oslo_middleware]</th>
</tr>
<tr>
<td><option>max_request_body_size</option> = <replaceable>114688</replaceable></td>
<td>(IntOpt) The maximum body size for each request, in bytes.</td>
</tr>
<tr>
<td><option>secure_proxy_ssl_header</option> = <replaceable>X-Forwarded-Proto</replaceable></td>
<td>(StrOpt) The HTTP Header that will be used to determine what the original request protocol scheme was, even if it was hidden by an SSL termination proxy.</td>
</tr>
<tr>
<th colspan="2">[oslo_policy]</th>
</tr>
<tr>
<td><option>policy_default_rule</option> = <replaceable>default</replaceable></td>
<td>(StrOpt) Default rule. Enforced when a requested rule is not found.</td>
</tr>
<tr>
<td><option>policy_dirs</option> = <replaceable>['policy.d']</replaceable></td>
<td>(MultiStrOpt) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.</td>
</tr>
<tr>
<td><option>policy_file</option> = <replaceable>policy.json</replaceable></td>
<td>(StrOpt) The JSON file that defines policies.</td>
</tr>
<tr>
<th colspan="2">[oslo_versionedobjects]</th>
</tr>
<tr>
<td><option>fatal_exception_format_errors</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Make exception message format errors fatal</td>
</tr>
<tr>
<th colspan="2">[paste_deploy]</th>
</tr>

6
doc/common/tables/heat-auth_token.xml
View File

@ -119,7 +119,7 @@
</tr>
<tr>
<td><option>memcache_pool_conn_get_timeout</option> = <replaceable>10</replaceable></td>
<td>(IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool.</td>
<td>(IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool.</td>
</tr>
<tr>
<td><option>memcache_pool_dead_retry</option> = <replaceable>300</replaceable></td>
@ -131,7 +131,7 @@
</tr>
<tr>
<td><option>memcache_pool_socket_timeout</option> = <replaceable>3</replaceable></td>
<td>(IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server.</td>
<td>(IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server.</td>
</tr>
<tr>
<td><option>memcache_pool_unused_timeout</option> = <replaceable>60</replaceable></td>
@ -147,7 +147,7 @@
</tr>
<tr>
<td><option>memcache_use_advanced_pool</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x.</td>
<td>(BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x.</td>
</tr>
<tr>
<td><option>revocation_cache_time</option> = <replaceable>10</replaceable></td>

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

@ -52,6 +52,10 @@
<td><option>max_header_line</option> = <replaceable>16384</replaceable></td>
<td>(IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs).</td>
</tr>
<tr>
<td><option>tcp_keepidle</option> = <replaceable>600</replaceable></td>
<td>(IntOpt) The value for the socket option TCP_KEEPIDLE. This is the time in seconds that the connection must be idle before TCP starts sending keepalive probes.</td>
</tr>
<tr>
<td><option>workers</option> = <replaceable>0</replaceable></td>
<td>(IntOpt) Number of workers for Heat service.</td>

6
doc/common/tables/heat-cloudwatch_api.xml
View File

@ -18,7 +18,7 @@
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td><option>enable_cloud_watch_lite</option> = <replaceable>True</replaceable></td>
<td><option>enable_cloud_watch_lite</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Enable the legacy OS::Heat::CWLiteAlarm resource.</td>
</tr>
<tr>
@ -52,6 +52,10 @@
<td><option>max_header_line</option> = <replaceable>16384</replaceable></td>
<td>(IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs.)</td>
</tr>
<tr>
<td><option>tcp_keepidle</option> = <replaceable>600</replaceable></td>
<td>(IntOpt) The value for the socket option TCP_KEEPIDLE. This is the time in seconds that the connection must be idle before TCP starts sending keepalive probes.</td>
</tr>
<tr>
<td><option>workers</option> = <replaceable>0</replaceable></td>
<td>(IntOpt) Number of workers for Heat service.</td>

73
doc/common/tables/heat-cors.xml Normal file
View File

@ -0,0 +1,73 @@
<?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_heat_cors">
<caption>Description of CORS 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">[cors]</th>
</tr>
<tr>
<td><option>allow_credentials</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Indicate that the actual request can include user credentials</td>
</tr>
<tr>
<td><option>allow_headers</option> = <replaceable>Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma</replaceable></td>
<td>(ListOpt) Indicate which header field names may be used during the actual request.</td>
</tr>
<tr>
<td><option>allow_methods</option> = <replaceable>GET, POST, PUT, DELETE, OPTIONS</replaceable></td>
<td>(ListOpt) Indicate which methods can be used during the actual request.</td>
</tr>
<tr>
<td><option>allowed_origin</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Indicate whether this resource may be shared with the domain received in the requests "origin" header.</td>
</tr>
<tr>
<td><option>expose_headers</option> = <replaceable>Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma</replaceable></td>
<td>(ListOpt) Indicate which headers are safe to expose to the API. Defaults to HTTP Simple Headers.</td>
</tr>
<tr>
<td><option>max_age</option> = <replaceable>3600</replaceable></td>
<td>(IntOpt) Maximum cache age of CORS preflight requests.</td>
</tr>
<tr>
<th colspan="2">[cors.subdomain]</th>
</tr>
<tr>
<td><option>allow_credentials</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Indicate that the actual request can include user credentials</td>
</tr>
<tr>
<td><option>allow_headers</option> = <replaceable>Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma</replaceable></td>
<td>(ListOpt) Indicate which header field names may be used during the actual request.</td>
</tr>
<tr>
<td><option>allow_methods</option> = <replaceable>GET, POST, PUT, DELETE, OPTIONS</replaceable></td>
<td>(ListOpt) Indicate which methods can be used during the actual request.</td>
</tr>
<tr>
<td><option>allowed_origin</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Indicate whether this resource may be shared with the domain received in the requests "origin" header.</td>
</tr>
<tr>
<td><option>expose_headers</option> = <replaceable>Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma</replaceable></td>
<td>(ListOpt) Indicate which headers are safe to expose to the API. Defaults to HTTP Simple Headers.</td>
</tr>
<tr>
<td><option>max_age</option> = <replaceable>3600</replaceable></td>
<td>(IntOpt) Maximum cache age of CORS preflight requests.</td>
</tr>
</tbody>
</table>
</para>

2
doc/common/tables/heat-crypt.xml
View File

@ -19,7 +19,7 @@
</tr>
<tr>
<td><option>auth_encryption_key</option> = <replaceable>notgood but just long enough i t</replaceable></td>
<td>(StrOpt) Key used to encrypt authentication info in the database. Length of this key must be 16, 24 or 32 characters.</td>
<td>(StrOpt) Key used to encrypt authentication info in the database. Length of this key must be 32 characters.</td>
</tr>
</tbody>
</table>

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

@ -1,26 +0,0 @@
<?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_heat_debug">
<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><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>
</tbody>
</table>
</para>

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

@ -29,10 +29,6 @@
<td><option>fatal_deprecations</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Enables or disables fatal status of deprecations.</td>
</tr>
<tr>
<td><option>fatal_exception_format_errors</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Make exception message format errors fatal</td>
</tr>
<tr>
<td><option>instance_format</option> = <replaceable>"[instance: %(uuid)s] "</replaceable></td>
<td>(StrOpt) The format for an instance that is passed with the log message.</td>
@ -74,7 +70,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>
@ -85,18 +81,18 @@
<td><option>syslog_log_facility</option> = <replaceable>LOG_USER</replaceable></td>
<td>(StrOpt) Syslog facility to receive log lines.</td>
</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>
</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>
</tr>
<tr>
<td><option>use_stderr</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Log output to standard error.</td>
</tr>
<tr>
<td><option>use_syslog</option> = <replaceable>False</replaceable></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>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 K, and will be removed in M, 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>

26
doc/common/tables/heat-oslo_middleware.xml
View File

@ -1,26 +0,0 @@
<?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_heat_oslo_middleware">
<caption>Description of oslo_middleware 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">[oslo_middleware]</th>
</tr>
<tr>
<td><option>max_request_body_size</option> = <replaceable>114688</replaceable></td>
<td>(IntOpt) The maximum body size for each request, in bytes.</td>
</tr>
</tbody>
</table>
</para>

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

@ -70,8 +70,8 @@
<td>(StrOpt) Username for Qpid connection.</td>
</tr>
<tr>
<td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
<td>(IntOpt) Size of RPC connection pool.</td>
<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>
</tr>
</tbody>
</table>

2
doc/common/tables/heat-quota.xml
View File

@ -27,7 +27,7 @@
</tr>
<tr>
<td><option>max_resources_per_stack</option> = <replaceable>1000</replaceable></td>
<td>(IntOpt) Maximum resources allowed per top-level stack.</td>
<td>(IntOpt) Maximum resources allowed per top-level stack. -1 stands for unlimited.</td>
</tr>
<tr>
<td><option>max_stacks_per_tenant</option> = <replaceable>100</replaceable></td>

12
doc/common/tables/heat-rabbitmq.xml
View File

@ -34,13 +34,17 @@
<td>(IntOpt) How often times during the heartbeat_timeout_threshold we check the heartbeat.</td>
</tr>
<tr>
<td><option>heartbeat_timeout_threshold</option> = <replaceable>0</replaceable></td>
<td>(IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disables the heartbeat, &gt;0 enables it. Enabling heartbeats requires kombu&gt;=3.0.7 and amqp&gt;=1.4.0). EXPERIMENTAL</td>
<td><option>heartbeat_timeout_threshold</option> = <replaceable>60</replaceable></td>
<td>(IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL</td>
</tr>
<tr>
<td><option>kombu_reconnect_delay</option> = <replaceable>1.0</replaceable></td>
<td>(FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification.</td>
</tr>
<tr>
<td><option>kombu_reconnect_timeout</option> = <replaceable>60</replaceable></td>
<td>(IntOpt) How long to wait before considering a reconnect attempt to have failed. This value should not be longer than rpc_response_timeout.</td>
</tr>
<tr>
<td><option>kombu_ssl_ca_certs</option> = <replaceable></replaceable></td>
<td>(StrOpt) SSL certification authority file (valid only if SSL enabled).</td>
@ -106,8 +110,8 @@
<td>(StrOpt) The RabbitMQ virtual host.</td>
</tr>
<tr>
<td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
<td>(IntOpt) Size of RPC connection pool.</td>
<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>
</tr>
</tbody>
</table>

15
doc/common/tables/heat-rpc.xml
View File

@ -37,6 +37,10 @@
<td><option>rpc_cast_timeout</option> = <replaceable>30</replaceable></td>
<td>(IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq.</td>
</tr>
<tr>
<td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
<td>(IntOpt) Size of RPC connection pool.</td>
</tr>
<tr>
<td><option>rpc_response_timeout</option> = <replaceable>60</replaceable></td>
<td>(IntOpt) Seconds to wait for a response from a call.</td>
@ -45,6 +49,17 @@
<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>
<tr>
<td><option>disable_process_locking</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Enables or disables inter-process locks.</td>
</tr>
<tr>
<td><option>lock_path</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Directory to use for lock files. For security, the specified directory should only be writable by the user running the processes that need locking. Defaults to environment variable OSLO_LOCK_PATH. If external locks are used, a lock path must be set.</td>
</tr>
<tr>
<th colspan="2">[oslo_messaging_amqp]</th>
</tr>

2
doc/common/tables/heat-waitcondition_api.xml
View File

@ -18,7 +18,7 @@
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td><option>heat_waitcondition_server_url</option> = <replaceable></replaceable></td>
<td><option>heat_waitcondition_server_url</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) URL of the Heat waitcondition server.</td>
</tr>
</tbody>

3
doc/config-reference/ch_orchestrationconfigure.xml
View File

@ -18,12 +18,11 @@
<xi:include href="../common/tables/heat-auth_token.xml"/>
<xi:include href="../common/tables/heat-common.xml"/>
<xi:include href="../common/tables/heat-cors.xml"/>
<xi:include href="../common/tables/heat-crypt.xml"/>
<xi:include href="../common/tables/heat-database.xml"/>
<xi:include href="../common/tables/heat-debug.xml"/>
<xi:include href="../common/tables/heat-loadbalancer.xml"/>
<xi:include href="../common/tables/heat-logging.xml"/>
<xi:include href="../common/tables/heat-oslo_middleware.xml"/>
<xi:include href="../common/tables/heat-quota.xml"/>
<xi:include href="../common/tables/heat-redis.xml"/>
<xi:include href="../common/tables/heat-testing.xml"/>

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

@ -1,6 +1,5 @@
action_retry_limit api
auth_encryption_key crypt
backdoor_port debug
cloud_backend clients_backends
control_exchange amqp
convergence_engine common
@ -14,16 +13,17 @@ deferred_auth_method common
enable_cloud_watch_lite cloudwatch_api
enable_stack_abandon api
enable_stack_adopt api
encrypt_parameters_and_properties api
engine_life_check_timeout rpc
environment_dir common
error_wait_time common
event_purge_batch_size common
fatal_deprecations logging
fatal_exception_format_errors 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
hidden_stack_tags api
host common
instance_connection_https_validate_certificates cfn_api
instance_connection_is_secure cfn_api
@ -31,13 +31,12 @@ instance_format logging
instance_user common
instance_uuid_format logging
keystone_backend common
list_notifier_drivers amqp
loadbalancer_template loadbalancer
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
@ -57,13 +56,11 @@ num_engine_workers api
onready notification
periodic_interval common
plugin_dirs common
policy_default_rule api
policy_dirs api
policy_file api
publish_errors logging
region_name_for_services clients
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
@ -80,12 +77,12 @@ stack_domain_admin_password api
stack_scheduler_hints api
stack_user_domain_id api
stack_user_domain_name api
syslog-log-facility logging
syslog_log_facility logging
transport_url amqp
trusts_delegated_roles api
use-syslog logging
use-syslog-rfc-format logging
use_stderr logging
use_syslog logging
use_syslog_rfc_format logging
verbose logging
auth_password/allowed_auth_uris api
auth_password/multi_cloud api
@ -147,6 +144,18 @@ clients_trove/cert_file clients_trove
clients_trove/endpoint_type clients_trove
clients_trove/insecure clients_trove
clients_trove/key_file clients_trove
cors/allow_credentials cors
cors/allow_headers cors
cors/allow_methods cors
cors/allowed_origin cors
cors/expose_headers cors
cors/max_age cors
cors.subdomain/allow_credentials cors
cors.subdomain/allow_headers cors
cors.subdomain/allow_methods cors
cors.subdomain/allowed_origin cors
cors.subdomain/expose_headers cors
cors.subdomain/max_age cors
database/backend database
database/connection database
database/connection_debug database
@ -174,12 +183,15 @@ ec2authtoken/cert_file api
ec2authtoken/insecure api
ec2authtoken/key_file api
ec2authtoken/multi_cloud api
eventlet_opts/client_socket_timeout api
eventlet_opts/wsgi_keep_alive api
heat_api/backlog api
heat_api/bind_host api
heat_api/bind_port api
heat_api/cert_file api
heat_api/key_file api
heat_api/max_header_line api
heat_api/tcp_keepidle api
heat_api/workers api
heat_api_cfn/backlog cfn_api
heat_api_cfn/bind_host cfn_api
@ -187,6 +199,7 @@ heat_api_cfn/bind_port cfn_api
heat_api_cfn/cert_file cfn_api
heat_api_cfn/key_file cfn_api
heat_api_cfn/max_header_line cfn_api
heat_api_cfn/tcp_keepidle cfn_api
heat_api_cfn/workers cfn_api
heat_api_cloudwatch/backlog cloudwatch_api
heat_api_cloudwatch/bind_host cloudwatch_api
@ -194,6 +207,7 @@ heat_api_cloudwatch/bind_port cloudwatch_api
heat_api_cloudwatch/cert_file cloudwatch_api
heat_api_cloudwatch/key_file cloudwatch_api
heat_api_cloudwatch/max_header_line cloudwatch_api
heat_api_cloudwatch/tcp_keepidle cloudwatch_api
heat_api_cloudwatch/workers cloudwatch_api
keystone_authtoken/admin_password auth_token
keystone_authtoken/admin_tenant_name auth_token
@ -236,6 +250,8 @@ matchmaker_redis/host redis
matchmaker_redis/password redis
matchmaker_redis/port redis
matchmaker_ring/ringfile redis
oslo_concurrency/disable_process_locking rpc
oslo_concurrency/lock_path rpc
oslo_messaging_amqp/allow_insecure_clients rpc
oslo_messaging_amqp/broadcast_prefix rpc
oslo_messaging_amqp/container_name rpc
@ -260,13 +276,14 @@ oslo_messaging_qpid/qpid_sasl_mechanisms qpid
oslo_messaging_qpid/qpid_tcp_nodelay qpid
oslo_messaging_qpid/qpid_topology_version qpid
oslo_messaging_qpid/qpid_username qpid
oslo_messaging_qpid/rpc_conn_pool_size qpid
oslo_messaging_qpid/send_single_reply qpid
oslo_messaging_rabbit/amqp_auto_delete rabbitmq
oslo_messaging_rabbit/amqp_durable_queues rabbitmq
oslo_messaging_rabbit/fake_rabbit rabbitmq
oslo_messaging_rabbit/heartbeat_rate rabbitmq
oslo_messaging_rabbit/heartbeat_timeout_threshold rabbitmq
oslo_messaging_rabbit/kombu_reconnect_delay rabbitmq
oslo_messaging_rabbit/kombu_reconnect_timeout rabbitmq
oslo_messaging_rabbit/kombu_ssl_ca_certs rabbitmq
oslo_messaging_rabbit/kombu_ssl_certfile rabbitmq
oslo_messaging_rabbit/kombu_ssl_keyfile rabbitmq
@ -283,8 +300,13 @@ oslo_messaging_rabbit/rabbit_retry_interval rabbitmq
oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
oslo_messaging_rabbit/rabbit_userid rabbitmq
oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq
oslo_middleware/max_request_body_size oslo_middleware
oslo_messaging_rabbit/send_single_reply rabbitmq
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
oslo_policy/policy_default_rule api
oslo_policy/policy_dirs api
oslo_policy/policy_file api
oslo_versionedobjects/fatal_exception_format_errors api
paste_deploy/api_paste_config api
paste_deploy/flavor api
profiler/profiler_enabled testing