openstack/openstack-manuals
Code Issues Proposed changes

Merge "update heat flags and tables"

Browse Source
This commit is contained in:
Jenkins 2014-03-20 22:25:44 +00:00 committed by Gerrit Code Review
commit 3160afa901
30 changed files with 42 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/common/tables/heat-amqp.xml
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_heat_amqp">
<caption>Description of configuration options for amqp</caption>
<col width="50%"/>
<col width="50%"/>
@ -54,10 +54,6 @@
<td>notification_topics = notifications</td>
<td>(ListOpt) AMQP topic used for OpenStack notifications</td>
</tr>
<tr>
<td>transport_url = None</td>
<td>(StrOpt) A URL representing the messaging driver to use and its full configuration. If not set, we fall back to the rpc_backend option and driver specific configuration.</td>
</tr>
</tbody>
</table>
</para>

12
doc/common/tables/heat-api.xml
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_heat_api">
<caption>Description of configuration options for api</caption>
<col width="50%"/>
<col width="50%"/>
@ -52,7 +52,7 @@
</tr>
<tr>
<td>stack_domain_admin = None</td>
<td>(StrOpt) Keystone username, a user with roles sufficient to manageusers and projects in the stack_user_domain.</td>
<td>(StrOpt) Keystone username, a user with roles sufficient to manage users and projects in the stack_user_domain.</td>
</tr>
<tr>
<td>stack_domain_admin_password = None</td>
@ -101,7 +101,7 @@
</tr>
<tr>
<td>bind_host = 0.0.0.0</td>
<td>(StrOpt) Address to bind the server. Useful when selecting a particular network interface.</td>
<td>(StrOpt) Address to bind the server. Useful when selecting a particular network interface.</td>
</tr>
<tr>
<td>bind_port = 8004</td>
@ -109,15 +109,15 @@
</tr>
<tr>
<td>cert_file = None</td>
<td>(StrOpt) Location of the SSL Certificate File to use for SSL mode.</td>
<td>(StrOpt) Location of the SSL certificate file to use for SSL mode.</td>
</tr>
<tr>
<td>key_file = None</td>
<td>(StrOpt) Location of the SSL Key File to use for enabling SSL mode.</td>
<td>(StrOpt) Location of the SSL key file to use for enabling SSL mode.</td>
</tr>
<tr>
<td>max_header_line = 16384</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>
<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>workers = 0</td>

10
doc/common/tables/heat-cfn_api.xml
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_heat_cfn_api">
<caption>Description of configuration options for cfn_api</caption>
<col width="50%"/>
<col width="50%"/>
@ -35,7 +35,7 @@
</tr>
<tr>
<td>bind_host = 0.0.0.0</td>
<td>(StrOpt) Address to bind the server. Useful when selecting a particular network interface.</td>
<td>(StrOpt) Address to bind the server. Useful when selecting a particular network interface.</td>
</tr>
<tr>
<td>bind_port = 8000</td>
@ -43,15 +43,15 @@
</tr>
<tr>
<td>cert_file = None</td>
<td>(StrOpt) Location of the SSL Certificate File to use for SSL mode.</td>
<td>(StrOpt) Location of the SSL certificate file to use for SSL mode.</td>
</tr>
<tr>
<td>key_file = None</td>
<td>(StrOpt) Location of the SSL Key File to use for enabling SSL mode.</td>
<td>(StrOpt) Location of the SSL key file to use for enabling SSL mode.</td>
</tr>
<tr>
<td>max_header_line = 16384</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>
<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>workers = 0</td>

2
doc/common/tables/heat-clients.xml
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_heat_clients">
<caption>Description of configuration options for clients</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-clients_backends.xml
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_heat_clients_backends">
<caption>Description of configuration options for clients_backends</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-clients_ceilometer.xml
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_heat_clients_ceilometer">
<caption>Description of configuration options for clients_ceilometer</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-clients_cinder.xml
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_heat_clients_cinder">
<caption>Description of configuration options for clients_cinder</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-clients_heat.xml
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_heat_clients_heat">
<caption>Description of configuration options for clients_heat</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-clients_keystone.xml
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_heat_clients_keystone">
<caption>Description of configuration options for clients_keystone</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-clients_neutron.xml
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_heat_clients_neutron">
<caption>Description of configuration options for clients_neutron</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-clients_nova.xml
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_heat_clients_nova">
<caption>Description of configuration options for clients_nova</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-clients_swift.xml
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_heat_clients_swift">
<caption>Description of configuration options for clients_swift</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-clients_trove.xml
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_heat_clients_trove">
<caption>Description of configuration options for clients_trove</caption>
<col width="50%"/>
<col width="50%"/>

10
doc/common/tables/heat-cloudwatch_api.xml
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_heat_cloudwatch_api">
<caption>Description of configuration options for cloudwatch_api</caption>
<col width="50%"/>
<col width="50%"/>
@ -31,7 +31,7 @@
</tr>
<tr>
<td>bind_host = 0.0.0.0</td>
<td>(StrOpt) Address to bind the server. Useful when selecting a particular network interface.</td>
<td>(StrOpt) Address to bind the server. Useful when selecting a particular network interface.</td>
</tr>
<tr>
<td>bind_port = 8003</td>
@ -39,15 +39,15 @@
</tr>
<tr>
<td>cert_file = None</td>
<td>(StrOpt) Location of the SSL Certificate File to use for SSL mode.</td>
<td>(StrOpt) Location of the SSL certificate file to use for SSL mode.</td>
</tr>
<tr>
<td>key_file = None</td>
<td>(StrOpt) Location of the SSL Key File to use for enabling SSL mode.</td>
<td>(StrOpt) Location of the SSL key file to use for enabling SSL mode.</td>
</tr>
<tr>
<td>max_header_line = 16384</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>
<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>workers = 0</td>

2
doc/common/tables/heat-common.xml
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_heat_common">
<caption>Description of configuration options for common</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-crypt.xml
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_heat_crypt">
<caption>Description of configuration options for crypt</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-database.xml
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_heat_database">
<caption>Description of configuration options for database</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-debug.xml
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_heat_debug">
<caption>Description of configuration options for debug</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-loadbalancer.xml
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_heat_loadbalancer">
<caption>Description of configuration options for loadbalancer</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-logging.xml
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_heat_logging">
<caption>Description of configuration options for logging</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-metadata_api.xml
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_heat_metadata_api">
<caption>Description of configuration options for metadata_api</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-notification.xml
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_heat_notification">
<caption>Description of configuration options for notification</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-qpid.xml
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_heat_qpid">
<caption>Description of configuration options for qpid</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-quota.xml
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_heat_quota">
<caption>Description of configuration options for quota</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-rabbitmq.xml
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_heat_rabbitmq">
<caption>Description of configuration options for rabbitmq</caption>
<col width="50%"/>
<col width="50%"/>

13
doc/common/tables/heat-redis.xml
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_heat_redis">
<caption>Description of configuration options for redis</caption>
<col width="50%"/>
<col width="50%"/>
@ -37,17 +37,6 @@
<td>port = 6379</td>
<td>(IntOpt) Use this port to connect to redis host.</td>
</tr>
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td>port = 6379</td>
<td>(IntOpt) Use this port to connect to redis host.</td>
</tr>
<tr>
<td>password = None</td>
<td>(StrOpt) Password for Redis server. (optional)</td>
</tr>
</tbody>
</table>
</para>

2
doc/common/tables/heat-rpc.xml
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_heat_rpc">
<caption>Description of configuration options for rpc</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-waitcondition_api.xml
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_heat_waitcondition_api">
<caption>Description of configuration options for waitcondition_api</caption>
<col width="50%"/>
<col width="50%"/>

2
doc/common/tables/heat-zeromq.xml
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_heat_zeromq">
<caption>Description of configuration options for zeromq</caption>
<col width="50%"/>
<col width="50%"/>

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

@ -201,6 +201,3 @@ rpc_notifier2/topics rpc
ssl/ca_file api cfn_api cloudwatch_api
ssl/cert_file api cfn_api cloudwatch_api
ssl/key_file api cfn_api cloudwatch_api
port redis
password redis
transport_url amqp