diff --git a/doc/common/tables/heat-amqp.xml b/doc/common/tables/heat-amqp.xml index dbf52e0820..aa08b8d008 100644 --- a/doc/common/tables/heat-amqp.xml +++ b/doc/common/tables/heat-amqp.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
@@ -54,10 +54,6 @@ - - - -
Description of configuration options for amqp
notification_topics = notifications (ListOpt) AMQP topic used for OpenStack notifications
transport_url = None(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.
diff --git a/doc/common/tables/heat-api.xml b/doc/common/tables/heat-api.xml index 0ae872798d..2880097c21 100644 --- a/doc/common/tables/heat-api.xml +++ b/doc/common/tables/heat-api.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
@@ -52,7 +52,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -109,15 +109,15 @@ - + - + - + diff --git a/doc/common/tables/heat-cfn_api.xml b/doc/common/tables/heat-cfn_api.xml index 811dff2333..34ac0af8f7 100644 --- a/doc/common/tables/heat-cfn_api.xml +++ b/doc/common/tables/heat-cfn_api.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for api
stack_domain_admin = None(StrOpt) Keystone username, a user with roles sufficient to manageusers and projects in the stack_user_domain.(StrOpt) Keystone username, a user with roles sufficient to manage users and projects in the stack_user_domain.
stack_domain_admin_password = None
bind_host = 0.0.0.0(StrOpt) Address to bind the server. Useful when selecting a particular network interface.(StrOpt) Address to bind the server. Useful when selecting a particular network interface.
bind_port = 8004
cert_file = None(StrOpt) Location of the SSL Certificate File to use for SSL mode.(StrOpt) Location of the SSL certificate file to use for SSL mode.
key_file = None(StrOpt) Location of the SSL Key File to use for enabling SSL mode.(StrOpt) Location of the SSL key file to use for enabling SSL mode.
max_header_line = 16384(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(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).
workers = 0
+
@@ -35,7 +35,7 @@ - + @@ -43,15 +43,15 @@ - + - + - + diff --git a/doc/common/tables/heat-clients.xml b/doc/common/tables/heat-clients.xml index 16d48d4ce8..3efd53da59 100644 --- a/doc/common/tables/heat-clients.xml +++ b/doc/common/tables/heat-clients.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for cfn_api
bind_host = 0.0.0.0(StrOpt) Address to bind the server. Useful when selecting a particular network interface.(StrOpt) Address to bind the server. Useful when selecting a particular network interface.
bind_port = 8000
cert_file = None(StrOpt) Location of the SSL Certificate File to use for SSL mode.(StrOpt) Location of the SSL certificate file to use for SSL mode.
key_file = None(StrOpt) Location of the SSL Key File to use for enabling SSL mode.(StrOpt) Location of the SSL key file to use for enabling SSL mode.
max_header_line = 16384(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(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).
workers = 0
+
diff --git a/doc/common/tables/heat-clients_backends.xml b/doc/common/tables/heat-clients_backends.xml index 5baef3b1ce..d9992a34b3 100644 --- a/doc/common/tables/heat-clients_backends.xml +++ b/doc/common/tables/heat-clients_backends.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients
+
diff --git a/doc/common/tables/heat-clients_ceilometer.xml b/doc/common/tables/heat-clients_ceilometer.xml index c656e041b9..6c1242f72c 100644 --- a/doc/common/tables/heat-clients_ceilometer.xml +++ b/doc/common/tables/heat-clients_ceilometer.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients_backends
+
diff --git a/doc/common/tables/heat-clients_cinder.xml b/doc/common/tables/heat-clients_cinder.xml index afcc1ebe41..0cea397303 100644 --- a/doc/common/tables/heat-clients_cinder.xml +++ b/doc/common/tables/heat-clients_cinder.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients_ceilometer
+
diff --git a/doc/common/tables/heat-clients_heat.xml b/doc/common/tables/heat-clients_heat.xml index 9f0ef16ac8..ef347efe9c 100644 --- a/doc/common/tables/heat-clients_heat.xml +++ b/doc/common/tables/heat-clients_heat.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients_cinder
+
diff --git a/doc/common/tables/heat-clients_keystone.xml b/doc/common/tables/heat-clients_keystone.xml index e91e47ba21..84d9d186d8 100644 --- a/doc/common/tables/heat-clients_keystone.xml +++ b/doc/common/tables/heat-clients_keystone.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients_heat
+
diff --git a/doc/common/tables/heat-clients_neutron.xml b/doc/common/tables/heat-clients_neutron.xml index 5a3120f639..fb4e49260a 100644 --- a/doc/common/tables/heat-clients_neutron.xml +++ b/doc/common/tables/heat-clients_neutron.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients_keystone
+
diff --git a/doc/common/tables/heat-clients_nova.xml b/doc/common/tables/heat-clients_nova.xml index 92c480701d..cde1012c1d 100644 --- a/doc/common/tables/heat-clients_nova.xml +++ b/doc/common/tables/heat-clients_nova.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients_neutron
+
diff --git a/doc/common/tables/heat-clients_swift.xml b/doc/common/tables/heat-clients_swift.xml index 3bb7d7d629..f597586310 100644 --- a/doc/common/tables/heat-clients_swift.xml +++ b/doc/common/tables/heat-clients_swift.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients_nova
+
diff --git a/doc/common/tables/heat-clients_trove.xml b/doc/common/tables/heat-clients_trove.xml index 017f11e09b..2008c11a17 100644 --- a/doc/common/tables/heat-clients_trove.xml +++ b/doc/common/tables/heat-clients_trove.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients_swift
+
diff --git a/doc/common/tables/heat-cloudwatch_api.xml b/doc/common/tables/heat-cloudwatch_api.xml index 7e501d90ab..9f6dfddc11 100644 --- a/doc/common/tables/heat-cloudwatch_api.xml +++ b/doc/common/tables/heat-cloudwatch_api.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for clients_trove
+
@@ -31,7 +31,7 @@ - + @@ -39,15 +39,15 @@ - + - + - + diff --git a/doc/common/tables/heat-common.xml b/doc/common/tables/heat-common.xml index 3a72419dc5..00f7dec9c2 100644 --- a/doc/common/tables/heat-common.xml +++ b/doc/common/tables/heat-common.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for cloudwatch_api
bind_host = 0.0.0.0(StrOpt) Address to bind the server. Useful when selecting a particular network interface.(StrOpt) Address to bind the server. Useful when selecting a particular network interface.
bind_port = 8003
cert_file = None(StrOpt) Location of the SSL Certificate File to use for SSL mode.(StrOpt) Location of the SSL certificate file to use for SSL mode.
key_file = None(StrOpt) Location of the SSL Key File to use for enabling SSL mode.(StrOpt) Location of the SSL key file to use for enabling SSL mode.
max_header_line = 16384(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(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.)
workers = 0
+
diff --git a/doc/common/tables/heat-crypt.xml b/doc/common/tables/heat-crypt.xml index 1a54371263..dcdd87c22e 100644 --- a/doc/common/tables/heat-crypt.xml +++ b/doc/common/tables/heat-crypt.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for common
+
diff --git a/doc/common/tables/heat-database.xml b/doc/common/tables/heat-database.xml index 51f146c9d5..a5b47c434b 100644 --- a/doc/common/tables/heat-database.xml +++ b/doc/common/tables/heat-database.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for crypt
+
diff --git a/doc/common/tables/heat-debug.xml b/doc/common/tables/heat-debug.xml index 2e5fe24ad4..f92ff231dc 100644 --- a/doc/common/tables/heat-debug.xml +++ b/doc/common/tables/heat-debug.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for database
+
diff --git a/doc/common/tables/heat-loadbalancer.xml b/doc/common/tables/heat-loadbalancer.xml index 39715a2de3..9de02b0094 100644 --- a/doc/common/tables/heat-loadbalancer.xml +++ b/doc/common/tables/heat-loadbalancer.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for debug
+
diff --git a/doc/common/tables/heat-logging.xml b/doc/common/tables/heat-logging.xml index e024b099b5..5f3e25e16a 100644 --- a/doc/common/tables/heat-logging.xml +++ b/doc/common/tables/heat-logging.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for loadbalancer
+
diff --git a/doc/common/tables/heat-metadata_api.xml b/doc/common/tables/heat-metadata_api.xml index 69e16fb0d3..9bf75c0d0f 100644 --- a/doc/common/tables/heat-metadata_api.xml +++ b/doc/common/tables/heat-metadata_api.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for logging
+
diff --git a/doc/common/tables/heat-notification.xml b/doc/common/tables/heat-notification.xml index af46113910..22af226944 100644 --- a/doc/common/tables/heat-notification.xml +++ b/doc/common/tables/heat-notification.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for metadata_api
+
diff --git a/doc/common/tables/heat-qpid.xml b/doc/common/tables/heat-qpid.xml index d0ec72f3a8..2a3ac5d27a 100644 --- a/doc/common/tables/heat-qpid.xml +++ b/doc/common/tables/heat-qpid.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for notification
+
diff --git a/doc/common/tables/heat-quota.xml b/doc/common/tables/heat-quota.xml index 58cc2b3653..dc797146b8 100644 --- a/doc/common/tables/heat-quota.xml +++ b/doc/common/tables/heat-quota.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for qpid
+
diff --git a/doc/common/tables/heat-rabbitmq.xml b/doc/common/tables/heat-rabbitmq.xml index a7bcc9bafa..dc66fef627 100644 --- a/doc/common/tables/heat-rabbitmq.xml +++ b/doc/common/tables/heat-rabbitmq.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for quota
+
diff --git a/doc/common/tables/heat-redis.xml b/doc/common/tables/heat-redis.xml index f885f3e2f5..da664aacef 100644 --- a/doc/common/tables/heat-redis.xml +++ b/doc/common/tables/heat-redis.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for rabbitmq
+
@@ -37,17 +37,6 @@ - - - - - - - - - - -
Description of configuration options for redis
port = 6379 (IntOpt) Use this port to connect to redis host.
[DEFAULT]
port = 6379(IntOpt) Use this port to connect to redis host.
password = None(StrOpt) Password for Redis server. (optional)
diff --git a/doc/common/tables/heat-rpc.xml b/doc/common/tables/heat-rpc.xml index 00fa531fb9..a2e53ef561 100644 --- a/doc/common/tables/heat-rpc.xml +++ b/doc/common/tables/heat-rpc.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/heat-waitcondition_api.xml b/doc/common/tables/heat-waitcondition_api.xml index 277ecd4e74..d8aced5fa9 100644 --- a/doc/common/tables/heat-waitcondition_api.xml +++ b/doc/common/tables/heat-waitcondition_api.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for rpc
+
diff --git a/doc/common/tables/heat-zeromq.xml b/doc/common/tables/heat-zeromq.xml index aad1943585..1bf53ae2bc 100644 --- a/doc/common/tables/heat-zeromq.xml +++ b/doc/common/tables/heat-zeromq.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for waitcondition_api
+
diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings index 2f8d811da5..fe41d8679c 100644 --- a/tools/autogenerate-config-flagmappings/heat.flagmappings +++ b/tools/autogenerate-config-flagmappings/heat.flagmappings @@ -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
Description of configuration options for zeromq