diff --git a/doc/common/tables/ceilometer-amqp.xml b/doc/common/tables/ceilometer-amqp.xml
index af03709999..5b7e2e245a 100644
--- a/doc/common/tables/ceilometer-amqp.xml
+++ b/doc/common/tables/ceilometer-amqp.xml
@@ -25,6 +25,10 @@
amqp_durable_queues = False |
(BoolOpt) Use durable queues in amqp. |
+
+ control_exchange = openstack |
+ (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid |
+
notification_driver = [] |
(MultiStrOpt) Driver or drivers to handle sending notifications. |
@@ -33,6 +37,10 @@
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/ceilometer-auth_token.xml b/doc/common/tables/ceilometer-auth_token.xml
index cd1714f9d3..2ebbdde1d6 100644
--- a/doc/common/tables/ceilometer-auth_token.xml
+++ b/doc/common/tables/ceilometer-auth_token.xml
@@ -117,10 +117,6 @@
memcache_security_strategy = None |
(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization. |
-
- memcached_servers = None |
- (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
-
revocation_cache_time = 10 |
(IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. |
diff --git a/doc/common/tables/ceilometer-common.xml b/doc/common/tables/ceilometer-common.xml
index 8226a11b32..23087b9882 100644
--- a/doc/common/tables/ceilometer-common.xml
+++ b/doc/common/tables/ceilometer-common.xml
@@ -17,14 +17,6 @@
[DEFAULT] |
-
- backdoor_port = None |
- (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
-
-
- disable_process_locking = False |
- (BoolOpt) Enables or disables inter-process locks. |
-
host = localhost |
(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. |
@@ -70,6 +62,13 @@
heartbeat = 1.0 |
(FloatOpt) Number of seconds between heartbeats for distributed coordination (float) |
+
+ [keystone_authtoken] |
+
+
+ memcached_servers = None |
+ (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
+
diff --git a/doc/common/tables/ceilometer-debug.xml b/doc/common/tables/ceilometer-debug.xml
index 1f9d85e824..71b406941f 100644
--- a/doc/common/tables/ceilometer-debug.xml
+++ b/doc/common/tables/ceilometer-debug.xml
@@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
- Description of debug configuration options
+ Description of logging configuration options
@@ -18,8 +18,12 @@
[DEFAULT] |
- debug = False |
- (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
+ backdoor_port = None |
+ (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
+
+
+ disable_process_locking = False |
+ (BoolOpt) Enables or disables inter-process locks. |
nova_http_log_debug = False |
diff --git a/doc/common/tables/ceilometer-exchange.xml b/doc/common/tables/ceilometer-exchange.xml
index 89760f9617..51f0c30337 100644
--- a/doc/common/tables/ceilometer-exchange.xml
+++ b/doc/common/tables/ceilometer-exchange.xml
@@ -21,10 +21,6 @@
cinder_control_exchange = cinder |
(StrOpt) Exchange name for Cinder notifications. |
-
- control_exchange = openstack |
- (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
-
glance_control_exchange = glance |
(StrOpt) Exchange name for Glance notifications. |
diff --git a/doc/common/tables/ceilometer-logging.xml b/doc/common/tables/ceilometer-logging.xml
index df53047632..92eabe6e32 100644
--- a/doc/common/tables/ceilometer-logging.xml
+++ b/doc/common/tables/ceilometer-logging.xml
@@ -17,6 +17,10 @@
[DEFAULT] |
+
+ debug = False |
+ (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
+
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 |
(ListOpt) List of logger=LEVEL pairs. |
diff --git a/doc/common/tables/ceilometer-rabbitmq.xml b/doc/common/tables/ceilometer-rabbitmq.xml
index dd296e6de7..68b856f52f 100644
--- a/doc/common/tables/ceilometer-rabbitmq.xml
+++ b/doc/common/tables/ceilometer-rabbitmq.xml
@@ -17,10 +17,6 @@
[DEFAULT] |
-
- fake_rabbit = False |
- (BoolOpt) If passed, use a fake RabbitMQ provider. |
-
kombu_reconnect_delay = 1.0 |
(FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
diff --git a/doc/common/tables/ceilometer-redis.xml b/doc/common/tables/ceilometer-redis.xml
index 8a2006bb50..fb917250c9 100644
--- a/doc/common/tables/ceilometer-redis.xml
+++ b/doc/common/tables/ceilometer-redis.xml
@@ -14,17 +14,6 @@
-
- [DEFAULT] |
-
-
- matchmaker_heartbeat_freq = 300 |
- (IntOpt) Heartbeat frequency. |
-
-
- matchmaker_heartbeat_ttl = 600 |
- (IntOpt) Heartbeat time-to-live. |
-
[matchmaker_redis] |
diff --git a/doc/common/tables/ceilometer-rpc.xml b/doc/common/tables/ceilometer-rpc.xml
index e90f23c790..f4b4b90125 100644
--- a/doc/common/tables/ceilometer-rpc.xml
+++ b/doc/common/tables/ceilometer-rpc.xml
@@ -22,8 +22,16 @@
(MultiStrOpt) Dispatcher to process data. |
- rpc_backend = rabbit |
- (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
+ matchmaker_heartbeat_freq = 300 |
+ (IntOpt) Heartbeat frequency. |
+
+
+ matchmaker_heartbeat_ttl = 600 |
+ (IntOpt) Heartbeat time-to-live. |
+
+
+ rpc_backend = ceilometer.openstack.common.rpc.impl_kombu |
+ (StrOpt) The messaging module to use, defaults to kombu. |
rpc_cast_timeout = 30 |
@@ -31,47 +39,15 @@
rpc_conn_pool_size = 30 |
- (IntOpt) Size of RPC connection pool. |
+ (IntOpt) Size of RPC connection pool |
rpc_response_timeout = 60 |
- (IntOpt) Seconds to wait for a response from a call. |
+ (IntOpt) Seconds to wait for a response from call or multicall |
rpc_thread_pool_size = 64 |
- (IntOpt) Size of RPC greenthread pool. |
-
-
- rpc_zmq_bind_address = * |
- (StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address. |
-
-
- rpc_zmq_contexts = 1 |
- (IntOpt) Number of ZeroMQ contexts, defaults to 1. |
-
-
- rpc_zmq_host = localhost |
- (StrOpt) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova. |
-
-
- rpc_zmq_ipc_dir = /var/run/openstack |
- (StrOpt) Directory for holding IPC sockets. |
-
-
- rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost |
- (StrOpt) MatchMaker driver. |
-
-
- rpc_zmq_port = 9501 |
- (IntOpt) ZeroMQ receiver listening port. |
-
-
- rpc_zmq_topic_backlog = None |
- (IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited. |
-
-
- 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. |
+ (IntOpt) Size of RPC thread pool |
[notification] |
diff --git a/doc/common/tables/neutron-notifier.xml b/doc/common/tables/ceilometer-testing.xml
similarity index 59%
rename from doc/common/tables/neutron-notifier.xml
rename to doc/common/tables/ceilometer-testing.xml
index d9210f99ea..5ddc181b98 100644
--- a/doc/common/tables/neutron-notifier.xml
+++ b/doc/common/tables/ceilometer-testing.xml
@@ -3,8 +3,8 @@
-
- Description of notifier configuration options
+
+ Description of testing configuration options
@@ -18,12 +18,8 @@
[DEFAULT] |
- notification_driver = [] |
- (MultiStrOpt) Driver or drivers to handle sending notifications. |
-
-
- notification_topics = notifications |
- (ListOpt) AMQP topic used for OpenStack notifications. |
+ fake_rabbit = False |
+ (BoolOpt) If passed, use a fake RabbitMQ provider |
diff --git a/doc/common/tables/ceilometer-zeromq.xml b/doc/common/tables/ceilometer-zeromq.xml
new file mode 100644
index 0000000000..3d07710664
--- /dev/null
+++ b/doc/common/tables/ceilometer-zeromq.xml
@@ -0,0 +1,50 @@
+
+
+
+
+ Description of ZeroMQ configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ rpc_zmq_bind_address = * |
+ (StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address. |
+
+
+ rpc_zmq_contexts = 1 |
+ (IntOpt) Number of ZeroMQ contexts, defaults to 1. |
+
+
+ rpc_zmq_host = localhost |
+ (StrOpt) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova. |
+
+
+ rpc_zmq_ipc_dir = /var/run/openstack |
+ (StrOpt) Directory for holding IPC sockets. |
+
+
+ rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost |
+ (StrOpt) MatchMaker driver. |
+
+
+ rpc_zmq_port = 9501 |
+ (IntOpt) ZeroMQ receiver listening port. |
+
+
+ rpc_zmq_topic_backlog = None |
+ (IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited. |
+
+
+
+
diff --git a/doc/common/tables/cinder-amqp.xml b/doc/common/tables/cinder-amqp.xml
new file mode 100644
index 0000000000..b4a6a899ce
--- /dev/null
+++ b/doc/common/tables/cinder-amqp.xml
@@ -0,0 +1,46 @@
+
+
+
+
+ Description of AMQP configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ amqp_auto_delete = False |
+ (BoolOpt) Auto-delete queues in amqp. |
+
+
+ amqp_durable_queues = False |
+ (BoolOpt) Use durable queues in amqp. |
+
+
+ control_exchange = openstack |
+ (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
+
+
+ notification_driver = [] |
+ (MultiStrOpt) Driver or drivers to handle sending notifications. |
+
+
+ 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/cinder-api.xml b/doc/common/tables/cinder-api.xml
index e5cbfb5dba..c2ac993a76 100644
--- a/doc/common/tables/cinder-api.xml
+++ b/doc/common/tables/cinder-api.xml
@@ -30,8 +30,8 @@
(IntOpt) Cache volume availability zones in memory for the provided duration in seconds |
- backdoor_port = None |
- (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
+ default_timeout = 525600 |
+ (IntOpt) Default timeout for CLI operations in minutes. For example, LUN migration is a typical long running operation, which depends on the LUN size and the load of the array. An upper bound in the specific deployment can be set to avoid unnecessary long wait. By default, it is 365 days long. |
enable_v1_api = True |
diff --git a/doc/common/tables/cinder-auth_token.xml b/doc/common/tables/cinder-auth_token.xml
index 488d0d0df7..ad663e396e 100644
--- a/doc/common/tables/cinder-auth_token.xml
+++ b/doc/common/tables/cinder-auth_token.xml
@@ -14,13 +14,6 @@
-
- [DEFAULT] |
-
-
- memcached_servers = None |
- (ListOpt) Memcached servers or None for in process cache. |
-
[keystone_authtoken] |
@@ -124,10 +117,6 @@
memcache_security_strategy = None |
(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization. |
-
- memcached_servers = None |
- (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
-
revocation_cache_time = 10 |
(IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. |
diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml
index a352f8f153..6e3ec9ef18 100644
--- a/doc/common/tables/cinder-common.xml
+++ b/doc/common/tables/cinder-common.xml
@@ -33,10 +33,6 @@
default_volume_type = None |
(StrOpt) Default volume type to use |
-
- disable_process_locking = False |
- (BoolOpt) Whether to disable inter-process locks |
-
enable_new_services = True |
(BoolOpt) Services to be added to the available pool on create |
@@ -57,6 +53,10 @@
lock_path = None |
(StrOpt) Directory to use for lock files. Default to a temp directory |
+
+ memcached_servers = None |
+ (ListOpt) Memcached servers or None for in process cache. |
+
monkey_patch = False |
(BoolOpt) Enable monkey patching |
@@ -158,8 +158,11 @@
(BoolOpt) Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy. |
- use_stderr = True |
- (BoolOpt) Log output to standard error. |
+ [keystone_authtoken] |
+
+
+ memcached_servers = None |
+ (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
diff --git a/doc/common/tables/cinder-debug.xml b/doc/common/tables/cinder-debug.xml
new file mode 100644
index 0000000000..2a329eedb1
--- /dev/null
+++ b/doc/common/tables/cinder-debug.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ Description of logging configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ backdoor_port = None |
+ (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
+
+
+ disable_process_locking = False |
+ (BoolOpt) Whether to disable inter-process locks |
+
+
+
+
diff --git a/doc/common/tables/cinder-logging.xml b/doc/common/tables/cinder-logging.xml
index e8a81a3c33..205dd64c54 100644
--- a/doc/common/tables/cinder-logging.xml
+++ b/doc/common/tables/cinder-logging.xml
@@ -85,6 +85,10 @@
syslog_log_facility = LOG_USER |
(StrOpt) Syslog facility to receive log lines. |
+
+ use_stderr = True |
+ (BoolOpt) Log output to standard error. |
+
use_syslog = False |
(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424. |
diff --git a/doc/common/tables/cinder-qpid.xml b/doc/common/tables/cinder-qpid.xml
new file mode 100644
index 0000000000..5809724a22
--- /dev/null
+++ b/doc/common/tables/cinder-qpid.xml
@@ -0,0 +1,66 @@
+
+
+
+
+ Description of Qpid configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ qpid_heartbeat = 60 |
+ (IntOpt) Seconds between connection keepalive heartbeats. |
+
+
+ qpid_hostname = localhost |
+ (StrOpt) Qpid broker hostname. |
+
+
+ qpid_hosts = $qpid_hostname:$qpid_port |
+ (ListOpt) Qpid HA cluster host:port pairs. |
+
+
+ qpid_password = |
+ (StrOpt) Password for Qpid connection. |
+
+
+ qpid_port = 5672 |
+ (IntOpt) Qpid broker port. |
+
+
+ qpid_protocol = tcp |
+ (StrOpt) Transport to use, either 'tcp' or 'ssl'. |
+
+
+ qpid_receiver_capacity = 1 |
+ (IntOpt) The number of prefetched messages held by receiver. |
+
+
+ qpid_sasl_mechanisms = |
+ (StrOpt) Space separated list of SASL mechanisms to use for auth. |
+
+
+ qpid_tcp_nodelay = True |
+ (BoolOpt) Whether to disable the Nagle algorithm. |
+
+
+ qpid_topology_version = 1 |
+ (IntOpt) The qpid topology version to use. Version 1 is what was originally used by impl_qpid. Version 2 includes some backwards-incompatible changes that allow broker federation to work. Users should update to version 2 when they are able to take everything down, as it requires a clean break. |
+
+
+ qpid_username = |
+ (StrOpt) Username for Qpid connection. |
+
+
+
+
diff --git a/doc/common/tables/cinder-rabbitmq.xml b/doc/common/tables/cinder-rabbitmq.xml
new file mode 100644
index 0000000000..74708472e9
--- /dev/null
+++ b/doc/common/tables/cinder-rabbitmq.xml
@@ -0,0 +1,90 @@
+
+
+
+
+ Description of RabbitMQ configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ kombu_reconnect_delay = 1.0 |
+ (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
+
+
+ kombu_ssl_ca_certs = |
+ (StrOpt) SSL certification authority file (valid only if SSL enabled). |
+
+
+ kombu_ssl_certfile = |
+ (StrOpt) SSL cert file (valid only if SSL enabled). |
+
+
+ kombu_ssl_keyfile = |
+ (StrOpt) SSL key file (valid only if SSL enabled). |
+
+
+ kombu_ssl_version = |
+ (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions. |
+
+
+ rabbit_ha_queues = False |
+ (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. |
+
+
+ rabbit_host = localhost |
+ (StrOpt) The RabbitMQ broker address where a single node is used. |
+
+
+ rabbit_hosts = $rabbit_host:$rabbit_port |
+ (ListOpt) RabbitMQ HA cluster host:port pairs. |
+
+
+ rabbit_login_method = AMQPLAIN |
+ (StrOpt) the RabbitMQ login method |
+
+
+ rabbit_max_retries = 0 |
+ (IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count). |
+
+
+ rabbit_password = guest |
+ (StrOpt) The RabbitMQ password. |
+
+
+ rabbit_port = 5672 |
+ (IntOpt) The RabbitMQ broker port where a single node is used. |
+
+
+ rabbit_retry_backoff = 2 |
+ (IntOpt) How long to backoff for between retries when connecting to RabbitMQ. |
+
+
+ rabbit_retry_interval = 1 |
+ (IntOpt) How frequently to retry connecting with RabbitMQ. |
+
+
+ rabbit_use_ssl = False |
+ (BoolOpt) Connect over SSL for RabbitMQ. |
+
+
+ rabbit_userid = guest |
+ (StrOpt) The RabbitMQ userid. |
+
+
+ rabbit_virtual_host = / |
+ (StrOpt) The RabbitMQ virtual host. |
+
+
+
+
diff --git a/doc/common/tables/glance-matchmaker.xml b/doc/common/tables/cinder-redis.xml
similarity index 62%
rename from doc/common/tables/glance-matchmaker.xml
rename to doc/common/tables/cinder-redis.xml
index 4c8f8d30d9..30f14e9124 100644
--- a/doc/common/tables/glance-matchmaker.xml
+++ b/doc/common/tables/cinder-redis.xml
@@ -3,8 +3,8 @@
-
- Description of matchmaker configuration options
+
+ Description of Redis configuration options
@@ -15,15 +15,19 @@
- [DEFAULT] |
+ [matchmaker_redis] |
- matchmaker_heartbeat_freq = 300 |
- (IntOpt) Heartbeat frequency. |
+ host = 127.0.0.1 |
+ (StrOpt) Host to locate redis. |
- matchmaker_heartbeat_ttl = 600 |
- (IntOpt) Heartbeat time-to-live. |
+ password = None |
+ (StrOpt) Password for Redis server (optional). |
+
+
+ port = 6379 |
+ (IntOpt) Use this port to connect to redis host. |
[matchmaker_ring] |
diff --git a/doc/common/tables/cinder-rpc.xml b/doc/common/tables/cinder-rpc.xml
index 225c619b0a..20e8425a60 100644
--- a/doc/common/tables/cinder-rpc.xml
+++ b/doc/common/tables/cinder-rpc.xml
@@ -17,46 +17,6 @@
[DEFAULT] |
-
- amqp_auto_delete = False |
- (BoolOpt) Auto-delete queues in amqp. |
-
-
- amqp_durable_queues = False |
- (BoolOpt) Use durable queues in amqp. |
-
-
- control_exchange = openstack |
- (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
-
-
- default_timeout = 525600 |
- (IntOpt) Default timeout for CLI operations in minutes. For example, LUN migration is a typical long running operation, which depends on the LUN size and the load of the array. An upper bound in the specific deployment can be set to avoid unnecessary long wait. By default, it is 365 days long. |
-
-
- fake_rabbit = False |
- (BoolOpt) If passed, use a fake RabbitMQ provider. |
-
-
- kombu_reconnect_delay = 1.0 |
- (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
-
-
- kombu_ssl_ca_certs = |
- (StrOpt) SSL certification authority file (valid only if SSL enabled). |
-
-
- kombu_ssl_certfile = |
- (StrOpt) SSL cert file (valid only if SSL enabled). |
-
-
- kombu_ssl_keyfile = |
- (StrOpt) SSL key file (valid only if SSL enabled). |
-
-
- kombu_ssl_version = |
- (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions. |
-
matchmaker_heartbeat_freq = 300 |
(IntOpt) Heartbeat frequency. |
@@ -65,106 +25,6 @@
matchmaker_heartbeat_ttl = 600 |
(IntOpt) Heartbeat time-to-live. |
-
- notification_driver = [] |
- (MultiStrOpt) Driver or drivers to handle sending notifications. |
-
-
- notification_topics = notifications |
- (ListOpt) AMQP topic used for OpenStack notifications. |
-
-
- qpid_heartbeat = 60 |
- (IntOpt) Seconds between connection keepalive heartbeats. |
-
-
- qpid_hostname = localhost |
- (StrOpt) Qpid broker hostname. |
-
-
- qpid_hosts = $qpid_hostname:$qpid_port |
- (ListOpt) Qpid HA cluster host:port pairs. |
-
-
- qpid_password = |
- (StrOpt) Password for Qpid connection. |
-
-
- qpid_port = 5672 |
- (IntOpt) Qpid broker port. |
-
-
- qpid_protocol = tcp |
- (StrOpt) Transport to use, either 'tcp' or 'ssl'. |
-
-
- qpid_receiver_capacity = 1 |
- (IntOpt) The number of prefetched messages held by receiver. |
-
-
- qpid_sasl_mechanisms = |
- (StrOpt) Space separated list of SASL mechanisms to use for auth. |
-
-
- qpid_tcp_nodelay = True |
- (BoolOpt) Whether to disable the Nagle algorithm. |
-
-
- qpid_topology_version = 1 |
- (IntOpt) The qpid topology version to use. Version 1 is what was originally used by impl_qpid. Version 2 includes some backwards-incompatible changes that allow broker federation to work. Users should update to version 2 when they are able to take everything down, as it requires a clean break. |
-
-
- qpid_username = |
- (StrOpt) Username for Qpid connection. |
-
-
- rabbit_ha_queues = False |
- (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. |
-
-
- rabbit_host = localhost |
- (StrOpt) The RabbitMQ broker address where a single node is used. |
-
-
- rabbit_hosts = $rabbit_host:$rabbit_port |
- (ListOpt) RabbitMQ HA cluster host:port pairs. |
-
-
- rabbit_login_method = AMQPLAIN |
- (StrOpt) the RabbitMQ login method |
-
-
- rabbit_max_retries = 0 |
- (IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count). |
-
-
- rabbit_password = guest |
- (StrOpt) The RabbitMQ password. |
-
-
- rabbit_port = 5672 |
- (IntOpt) The RabbitMQ broker port where a single node is used. |
-
-
- rabbit_retry_backoff = 2 |
- (IntOpt) How long to backoff for between retries when connecting to RabbitMQ. |
-
-
- rabbit_retry_interval = 1 |
- (IntOpt) How frequently to retry connecting with RabbitMQ. |
-
-
- rabbit_use_ssl = False |
- (BoolOpt) Connect over SSL for RabbitMQ. |
-
-
- rabbit_userid = guest |
- (StrOpt) The RabbitMQ userid. |
-
-
- rabbit_virtual_host = / |
- (StrOpt) The RabbitMQ virtual host. |
-
rpc_backend = rabbit |
(StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
@@ -185,64 +45,10 @@
rpc_thread_pool_size = 64 |
(IntOpt) Size of RPC greenthread pool. |
-
- rpc_zmq_bind_address = * |
- (StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address. |
-
-
- rpc_zmq_contexts = 1 |
- (IntOpt) Number of ZeroMQ contexts, defaults to 1. |
-
-
- rpc_zmq_host = localhost |
- (StrOpt) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova. |
-
-
- rpc_zmq_ipc_dir = /var/run/openstack |
- (StrOpt) Directory for holding IPC sockets. |
-
-
- rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost |
- (StrOpt) MatchMaker driver. |
-
-
- rpc_zmq_port = 9501 |
- (IntOpt) ZeroMQ receiver listening port. |
-
-
- rpc_zmq_topic_backlog = None |
- (IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited. |
-
-
- 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. |
-
volume_topic = cinder-volume |
(StrOpt) The topic that volume nodes listen on |
-
- [matchmaker_redis] |
-
-
- host = 127.0.0.1 |
- (StrOpt) Host to locate redis. |
-
-
- password = None |
- (StrOpt) Password for Redis server (optional). |
-
-
- port = 6379 |
- (IntOpt) Use this port to connect to redis host. |
-
-
- [matchmaker_ring] |
-
-
- ringfile = /etc/oslo/matchmaker_ring.json |
- (StrOpt) Matchmaker ring file (JSON). |
-
diff --git a/doc/common/tables/cinder-solidfire.xml b/doc/common/tables/cinder-solidfire.xml
index be72c9aacc..b41c3772f4 100644
--- a/doc/common/tables/cinder-solidfire.xml
+++ b/doc/common/tables/cinder-solidfire.xml
@@ -31,7 +31,7 @@
sf_emulate_512 = True |
- (BoolOpt) Set 512 byte emulation on volume creation; |
+ (BoolOpt) Set 512 byte emulation on volume creation; |
diff --git a/doc/common/tables/cinder-testing.xml b/doc/common/tables/cinder-testing.xml
new file mode 100644
index 0000000000..174b5699ba
--- /dev/null
+++ b/doc/common/tables/cinder-testing.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ Description of testing configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ fake_rabbit = False |
+ (BoolOpt) If passed, use a fake RabbitMQ provider. |
+
+
+
+
diff --git a/doc/common/tables/cinder-zeromq.xml b/doc/common/tables/cinder-zeromq.xml
new file mode 100644
index 0000000000..b35b2eb3db
--- /dev/null
+++ b/doc/common/tables/cinder-zeromq.xml
@@ -0,0 +1,50 @@
+
+
+
+
+ Description of ZeroMQ configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ rpc_zmq_bind_address = * |
+ (StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address. |
+
+
+ rpc_zmq_contexts = 1 |
+ (IntOpt) Number of ZeroMQ contexts, defaults to 1. |
+
+
+ rpc_zmq_host = localhost |
+ (StrOpt) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova. |
+
+
+ rpc_zmq_ipc_dir = /var/run/openstack |
+ (StrOpt) Directory for holding IPC sockets. |
+
+
+ rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost |
+ (StrOpt) MatchMaker driver. |
+
+
+ rpc_zmq_port = 9501 |
+ (IntOpt) ZeroMQ receiver listening port. |
+
+
+ rpc_zmq_topic_backlog = None |
+ (IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited. |
+
+
+
+
diff --git a/doc/common/tables/glance-amqp.xml b/doc/common/tables/glance-amqp.xml
index 727e9c28e7..e01f9c4724 100644
--- a/doc/common/tables/glance-amqp.xml
+++ b/doc/common/tables/glance-amqp.xml
@@ -25,6 +25,14 @@
amqp_durable_queues = False |
(BoolOpt) Use durable queues in amqp. |
+
+ control_exchange = openstack |
+ (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
+
+
+ default_publisher_id = image.localhost |
+ (StrOpt) Default publisher_id for outgoing notifications. |
+
notification_driver = [] |
(MultiStrOpt) Driver or drivers to handle sending notifications. |
@@ -33,22 +41,6 @@
notification_topics = notifications |
(ListOpt) AMQP topic used for OpenStack notifications. |
-
- rpc_backend = rabbit |
- (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
-
-
- rpc_conn_pool_size = 30 |
- (IntOpt) Size of RPC connection pool. |
-
-
- rpc_response_timeout = 60 |
- (IntOpt) Seconds to wait for a response from a call. |
-
-
- rpc_thread_pool_size = 64 |
- (IntOpt) Size of RPC greenthread pool. |
-
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/glance-api.xml b/doc/common/tables/glance-api.xml
index f178d8f6b6..3db8d29217 100644
--- a/doc/common/tables/glance-api.xml
+++ b/doc/common/tables/glance-api.xml
@@ -25,10 +25,6 @@
allow_anonymous_access = False |
(BoolOpt) Allow unauthenticated users to access the API with read-only privileges. This only applies when using ContextMiddleware. |
-
- default_publisher_id = image.localhost |
- (StrOpt) Default publisher_id for outgoing notifications. |
-
enable_v1_api = True |
(BoolOpt) Deploy the v1 OpenStack Images API. |
@@ -45,6 +41,10 @@
enable_v2_registry = True |
(BoolOpt) Deploy the v2 OpenStack Registry API. |
+
+ eventlet_hub = poll |
+ (StrOpt) Name of eventlet hub to use. Traditionally, we have only supported 'poll', however 'selects' may be appropriate for some platforms. See http://eventlet.net/doc/hubs.html for more details. |
+
image_size_cap = 1099511627776 |
(IntOpt) Maximum size of image a user can upload in bytes. Defaults to 1099511627776 bytes (1 TB). |
@@ -53,6 +53,10 @@
location_strategy = location_order |
(StrOpt) This value sets what strategy will be used to determine the image location order. Currently two strategies are packaged with Glance 'location_order' and 'store_type'. |
+
+ 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 |
+
owner_is_tenant = True |
(BoolOpt) When true, this option sets the owner of an image to be the tenant. Otherwise, the owner of the image will be the authenticated user issuing the request. |
@@ -65,6 +69,10 @@
show_multiple_locations = False |
(BoolOpt) Whether to include the backend image locations in image properties. Revealing storage location can be a security risk, so use this setting with caution! The overrides show_image_direct_url. |
+
+ tcp_keepidle = 600 |
+ (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. |
+
use_user_token = True |
(BoolOpt) Whether to pass through the user token when making requests to the registry. |
@@ -80,6 +88,17 @@
stores = file, http |
(ListOpt) List of stores enabled |
+
+ [paste_deploy] |
+
+
+ config_file = None |
+ (StrOpt) Name of the paste configuration file. |
+
+
+ flavor = None |
+ (StrOpt) Partial name of a pipeline in your paste configuration file with the service name removed. For example, if your paste section name is [pipeline:glance-api-keystone] use the value "keystone" |
+
[store_type_location_strategy] |
diff --git a/doc/common/tables/glance-auth_token.xml b/doc/common/tables/glance-auth_token.xml
index f91bfa41bd..4b715c0d2e 100644
--- a/doc/common/tables/glance-auth_token.xml
+++ b/doc/common/tables/glance-auth_token.xml
@@ -14,13 +14,6 @@
-
- [DEFAULT] |
-
-
- memcached_servers = None |
- (ListOpt) Memcached servers or None for in process cache. |
-
[keystone_authtoken] |
@@ -124,10 +117,6 @@
memcache_security_strategy = None |
(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization. |
-
- memcached_servers = None |
- (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
-
revocation_cache_time = 10 |
(IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. |
diff --git a/doc/common/tables/glance-common.xml b/doc/common/tables/glance-common.xml
index df214cf0c3..33da2aa869 100644
--- a/doc/common/tables/glance-common.xml
+++ b/doc/common/tables/glance-common.xml
@@ -41,10 +41,6 @@
data_api = glance.db.sqlalchemy.api |
(StrOpt) Python module path of data access API |
-
- disable_process_locking = False |
- (BoolOpt) Enables or disables inter-process locks. |
-
image_location_quota = 10 |
(IntOpt) Maximum number of locations allowed on an image. Negative values evaluate to unlimited. |
@@ -69,6 +65,10 @@
lock_path = None |
(StrOpt) Directory to use for lock files. |
+
+ memcached_servers = None |
+ (ListOpt) Memcached servers or None for in process cache. |
+
metadata_encryption_key = None |
(StrOpt) Key used for encrypting sensitive metadata while talking to the registry or database. |
@@ -115,6 +115,13 @@
disk_formats = ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso |
(ListOpt) Supported values for the 'disk_format' image attribute |
+
+ [keystone_authtoken] |
+
+
+ memcached_servers = None |
+ (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
+
[task] |
diff --git a/doc/common/tables/glance-debug.xml b/doc/common/tables/glance-debug.xml
new file mode 100644
index 0000000000..b23b6b1203
--- /dev/null
+++ b/doc/common/tables/glance-debug.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ Description of logging configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ disable_process_locking = False |
+ (BoolOpt) Enables or disables inter-process locks. |
+
+
+
+
diff --git a/doc/common/tables/glance-paste.xml b/doc/common/tables/glance-paste.xml
deleted file mode 100644
index f2e93bcecb..0000000000
--- a/doc/common/tables/glance-paste.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- Description of paste configuration options
-
-
-
-
- Configuration option = Default value |
- Description |
-
-
-
-
- [paste_deploy] |
-
-
- config_file = None |
- (StrOpt) Name of the paste configuration file. |
-
-
- flavor = None |
- (StrOpt) Partial name of a pipeline in your paste configuration file with the service name removed. For example, if your paste section name is [pipeline:glance-api-keystone] use the value "keystone" |
-
-
-
-
diff --git a/doc/common/tables/glance-rabbitmq.xml b/doc/common/tables/glance-rabbitmq.xml
index bc06e2e23c..faedf4eb61 100644
--- a/doc/common/tables/glance-rabbitmq.xml
+++ b/doc/common/tables/glance-rabbitmq.xml
@@ -17,14 +17,6 @@
[DEFAULT] |
-
- control_exchange = openstack |
- (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
-
-
- fake_rabbit = False |
- (BoolOpt) If passed, use a fake RabbitMQ provider. |
-
kombu_reconnect_delay = 1.0 |
(FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
diff --git a/doc/common/tables/glance-redis.xml b/doc/common/tables/glance-redis.xml
index 4cd4a8983f..a449c3a941 100644
--- a/doc/common/tables/glance-redis.xml
+++ b/doc/common/tables/glance-redis.xml
@@ -29,6 +29,13 @@
port = 6379 |
(IntOpt) Use this port to connect to redis host. |
+
+ [matchmaker_ring] |
+
+
+ ringfile = /etc/oslo/matchmaker_ring.json |
+ (StrOpt) Matchmaker ring file (JSON). |
+
diff --git a/doc/common/tables/glance-rpc.xml b/doc/common/tables/glance-rpc.xml
index 39aa610c0f..daa3760be2 100644
--- a/doc/common/tables/glance-rpc.xml
+++ b/doc/common/tables/glance-rpc.xml
@@ -21,6 +21,34 @@
allowed_rpc_exception_modules = openstack.common.exception, glance.common.exception, exceptions |
(ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call. |
+
+ matchmaker_heartbeat_freq = 300 |
+ (IntOpt) Heartbeat frequency. |
+
+
+ matchmaker_heartbeat_ttl = 600 |
+ (IntOpt) Heartbeat time-to-live. |
+
+
+ rpc_backend = rabbit |
+ (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
+
+
+ rpc_cast_timeout = 30 |
+ (IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq. |
+
+
+ rpc_conn_pool_size = 30 |
+ (IntOpt) Size of RPC connection pool. |
+
+
+ rpc_response_timeout = 60 |
+ (IntOpt) Seconds to wait for a response from a call. |
+
+
+ rpc_thread_pool_size = 64 |
+ (IntOpt) Size of RPC greenthread pool. |
+
diff --git a/doc/common/tables/glance-testing.xml b/doc/common/tables/glance-testing.xml
index 83862451c8..322ef01b0b 100644
--- a/doc/common/tables/glance-testing.xml
+++ b/doc/common/tables/glance-testing.xml
@@ -17,6 +17,10 @@
[DEFAULT] |
+
+ fake_rabbit = False |
+ (BoolOpt) If passed, use a fake RabbitMQ provider. |
+
pydev_worker_debug_host = None |
(StrOpt) The hostname/IP of the pydev process listening for debug connections |
diff --git a/doc/common/tables/glance-wsgi.xml b/doc/common/tables/glance-wsgi.xml
deleted file mode 100644
index 6664a0c482..0000000000
--- a/doc/common/tables/glance-wsgi.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- Description of WSGI configuration options
-
-
-
-
- Configuration option = Default value |
- Description |
-
-
-
-
- [DEFAULT] |
-
-
- eventlet_hub = poll |
- (StrOpt) Name of eventlet hub to use. Traditionally, we have only supported 'poll', however 'selects' may be appropriate for some platforms. See http://eventlet.net/doc/hubs.html for more details. |
-
-
- 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 |
-
-
- tcp_keepidle = 600 |
- (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. |
-
-
-
-
diff --git a/doc/common/tables/glance-zeromq.xml b/doc/common/tables/glance-zeromq.xml
index b3d55161fd..5b446cf193 100644
--- a/doc/common/tables/glance-zeromq.xml
+++ b/doc/common/tables/glance-zeromq.xml
@@ -17,10 +17,6 @@
[DEFAULT] |
-
- rpc_cast_timeout = 30 |
- (IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq. |
-
rpc_zmq_bind_address = * |
(StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address. |
diff --git a/doc/common/tables/heat-amqp.xml b/doc/common/tables/heat-amqp.xml
index 42ccef6abf..5ff1e61289 100644
--- a/doc/common/tables/heat-amqp.xml
+++ b/doc/common/tables/heat-amqp.xml
@@ -27,7 +27,7 @@
control_exchange = openstack |
- (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
+ (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid |
default_notification_level = INFO |
@@ -37,10 +37,6 @@
default_publisher_id = None |
(StrOpt) Default publisher_id for outgoing notifications. |
-
- fake_rabbit = False |
- (BoolOpt) If passed, use a fake RabbitMQ provider. |
-
list_notifier_drivers = None |
(MultiStrOpt) List of drivers to send notifications (DEPRECATED). |
@@ -53,6 +49,10 @@
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-auth_token.xml b/doc/common/tables/heat-auth_token.xml
index 006fdeece3..e5d474292e 100644
--- a/doc/common/tables/heat-auth_token.xml
+++ b/doc/common/tables/heat-auth_token.xml
@@ -14,13 +14,6 @@
-
- [DEFAULT] |
-
-
- memcached_servers = None |
- (ListOpt) Memcached servers or None for in process cache. |
-
[keystone_authtoken] |
@@ -124,10 +117,6 @@
memcache_security_strategy = None |
(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization. |
-
- memcached_servers = None |
- (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
-
revocation_cache_time = 10 |
(IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. |
diff --git a/doc/common/tables/heat-common.xml b/doc/common/tables/heat-common.xml
index 4ab106f24e..528a98c07a 100644
--- a/doc/common/tables/heat-common.xml
+++ b/doc/common/tables/heat-common.xml
@@ -49,6 +49,10 @@
lock_path = None |
(StrOpt) Directory to use for lock files. |
+
+ memcached_servers = None |
+ (ListOpt) Memcached servers or None for in process cache. |
+
periodic_interval = 60 |
(IntOpt) Seconds between running periodic tasks. |
@@ -57,6 +61,13 @@
plugin_dirs = /usr/lib64/heat, /usr/lib/heat |
(ListOpt) List of directories to search for plug-ins. |
+
+ [keystone_authtoken] |
+
+
+ memcached_servers = None |
+ (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
+
[revision] |
diff --git a/doc/common/tables/heat-debug.xml b/doc/common/tables/heat-debug.xml
index 8842057361..23eaf38112 100644
--- a/doc/common/tables/heat-debug.xml
+++ b/doc/common/tables/heat-debug.xml
@@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
- Description of debug configuration options
+ Description of logging configuration options
@@ -21,10 +21,6 @@
backdoor_port = None |
(StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
-
- debug = False |
- (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
-
disable_process_locking = False |
(BoolOpt) Enables or disables inter-process locks. |
diff --git a/doc/common/tables/heat-logging.xml b/doc/common/tables/heat-logging.xml
index 22234fc6d0..3b87ca956d 100644
--- a/doc/common/tables/heat-logging.xml
+++ b/doc/common/tables/heat-logging.xml
@@ -17,6 +17,10 @@
[DEFAULT] |
+
+ debug = False |
+ (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
+
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 |
(ListOpt) List of logger=LEVEL pairs. |
@@ -69,6 +73,10 @@
logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s |
(StrOpt) Prefix each line of exception output with this format. |
+
+ publish_errors = False |
+ (BoolOpt) Enables or disables publication of error events. |
+
syslog_log_facility = LOG_USER |
(StrOpt) Syslog facility to receive log lines. |
diff --git a/doc/common/tables/heat-notification.xml b/doc/common/tables/heat-notification.xml
index 84cb95f639..c2f1ab9d1f 100644
--- a/doc/common/tables/heat-notification.xml
+++ b/doc/common/tables/heat-notification.xml
@@ -21,10 +21,6 @@
onready = None |
(StrOpt) Deprecated. |
-
- publish_errors = False |
- (BoolOpt) Enables or disables publication of error events. |
-
diff --git a/doc/common/tables/heat-redis.xml b/doc/common/tables/heat-redis.xml
index 55d34666c1..ec5ad80e68 100644
--- a/doc/common/tables/heat-redis.xml
+++ b/doc/common/tables/heat-redis.xml
@@ -29,6 +29,13 @@
port = 6379 |
(IntOpt) Use this port to connect to redis host. |
+
+ [matchmaker_ring] |
+
+
+ ringfile = /etc/oslo/matchmaker_ring.json |
+ (StrOpt) Matchmaker ring file (JSON). |
+
diff --git a/doc/common/tables/heat-rpc.xml b/doc/common/tables/heat-rpc.xml
index 269777b531..8dbc2f930f 100644
--- a/doc/common/tables/heat-rpc.xml
+++ b/doc/common/tables/heat-rpc.xml
@@ -30,8 +30,8 @@
(IntOpt) Heartbeat time-to-live. |
- rpc_backend = rabbit |
- (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
+ rpc_backend = heat.openstack.common.rpc.impl_kombu |
+ (StrOpt) The messaging module to use, defaults to kombu. |
rpc_cast_timeout = 30 |
@@ -39,26 +39,15 @@
rpc_conn_pool_size = 30 |
- (IntOpt) Size of RPC connection pool. |
+ (IntOpt) Size of RPC connection pool |
rpc_response_timeout = 60 |
- (IntOpt) Seconds to wait for a response from a call. |
+ (IntOpt) Seconds to wait for a response from call or multicall |
rpc_thread_pool_size = 64 |
- (IntOpt) Size of RPC greenthread pool. |
-
-
- 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. |
-
-
- [matchmaker_ring] |
-
-
- ringfile = /etc/oslo/matchmaker_ring.json |
- (StrOpt) Matchmaker ring file (JSON). |
+ (IntOpt) Size of RPC thread pool |
diff --git a/doc/common/tables/keystone-misc.xml b/doc/common/tables/heat-testing.xml
similarity index 71%
rename from doc/common/tables/keystone-misc.xml
rename to doc/common/tables/heat-testing.xml
index 79addaaffd..14f8d49e1c 100644
--- a/doc/common/tables/keystone-misc.xml
+++ b/doc/common/tables/heat-testing.xml
@@ -3,8 +3,8 @@
-
- Description of configuration options for misc
+
+ Description of testing configuration options
@@ -18,8 +18,8 @@
[DEFAULT] |
- lock_path = None |
- (StrOpt) Directory to use for lock files. |
+ fake_rabbit = False |
+ (BoolOpt) If passed, use a fake RabbitMQ provider |
diff --git a/doc/common/tables/keystone-amqp.xml b/doc/common/tables/keystone-amqp.xml
index 4acbb5dc8b..8a00657947 100644
--- a/doc/common/tables/keystone-amqp.xml
+++ b/doc/common/tables/keystone-amqp.xml
@@ -41,26 +41,6 @@
notification_topics = notifications |
(ListOpt) AMQP topic used for OpenStack notifications. |
-
- rpc_backend = rabbit |
- (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
-
-
- rpc_cast_timeout = 30 |
- (IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq. |
-
-
- rpc_conn_pool_size = 30 |
- (IntOpt) Size of RPC connection pool. |
-
-
- rpc_response_timeout = 60 |
- (IntOpt) Seconds to wait for a response from a call. |
-
-
- rpc_thread_pool_size = 64 |
- (IntOpt) Size of RPC greenthread pool. |
-
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/keystone-auth_token.xml b/doc/common/tables/keystone-auth_token.xml
index 96fd036aa3..9505f29193 100644
--- a/doc/common/tables/keystone-auth_token.xml
+++ b/doc/common/tables/keystone-auth_token.xml
@@ -14,13 +14,6 @@
-
- [DEFAULT] |
-
-
- memcached_servers = None |
- (ListOpt) Memcached servers or None for in process cache. |
-
[keystone_authtoken] |
@@ -124,10 +117,6 @@
memcache_security_strategy = None |
(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization. |
-
- memcached_servers = None |
- (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
-
revocation_cache_time = 10 |
(IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. |
diff --git a/doc/common/tables/neutron-wsgi.xml b/doc/common/tables/keystone-common.xml
similarity index 55%
rename from doc/common/tables/neutron-wsgi.xml
rename to doc/common/tables/keystone-common.xml
index 1e4b1a3e20..e9e4970b38 100644
--- a/doc/common/tables/neutron-wsgi.xml
+++ b/doc/common/tables/keystone-common.xml
@@ -3,8 +3,8 @@
-
- Description of WSGI configuration options
+
+ Description of common configuration options
@@ -18,16 +18,15 @@
[DEFAULT] |
- backlog = 4096 |
- (IntOpt) Number of backlog requests to configure the socket with |
+ memcached_servers = None |
+ (ListOpt) Memcached servers or None for in process cache. |
- retry_until_window = 30 |
- (IntOpt) Number of seconds to keep retrying to listen |
+ [keystone_authtoken] |
- tcp_keepidle = 600 |
- (IntOpt) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X. |
+ memcached_servers = None |
+ (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
diff --git a/doc/common/tables/keystone-debug.xml b/doc/common/tables/keystone-debug.xml
index 365f940fc3..e6296d25cb 100644
--- a/doc/common/tables/keystone-debug.xml
+++ b/doc/common/tables/keystone-debug.xml
@@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
- Description of debug configuration options
+ Description of logging configuration options
@@ -21,18 +21,6 @@
backdoor_port = None |
(StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
-
- debug = False |
- (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
-
-
- fatal_deprecations = False |
- (BoolOpt) Enables or disables fatal status of deprecations. |
-
-
- publish_errors = False |
- (BoolOpt) Enables or disables publication of error events. |
-
pydev_debug_host = None |
(StrOpt) Host to connect to for remote debugger. |
diff --git a/doc/common/tables/keystone-logging.xml b/doc/common/tables/keystone-logging.xml
index 464a5d7eec..e7393f88f8 100644
--- a/doc/common/tables/keystone-logging.xml
+++ b/doc/common/tables/keystone-logging.xml
@@ -17,10 +17,18 @@
[DEFAULT] |
+
+ debug = False |
+ (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
+
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 |
(ListOpt) List of logger=LEVEL pairs. |
+
+ fatal_deprecations = False |
+ (BoolOpt) Enables or disables fatal status of deprecations. |
+
instance_format = "[instance: %(uuid)s] " |
(StrOpt) The format for an instance that is passed with the log message. |
@@ -65,6 +73,10 @@
logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s |
(StrOpt) Prefix each line of exception output with this format. |
+
+ publish_errors = False |
+ (BoolOpt) Enables or disables publication of error events. |
+
syslog_log_facility = LOG_USER |
(StrOpt) Syslog facility to receive log lines. |
diff --git a/doc/common/tables/keystone-rabbitmq.xml b/doc/common/tables/keystone-rabbitmq.xml
index cc2681d7e5..24b72032ae 100644
--- a/doc/common/tables/keystone-rabbitmq.xml
+++ b/doc/common/tables/keystone-rabbitmq.xml
@@ -17,10 +17,6 @@
[DEFAULT] |
-
- fake_rabbit = False |
- (BoolOpt) If passed, use a fake RabbitMQ provider. |
-
kombu_reconnect_delay = 1.0 |
(FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
diff --git a/doc/common/tables/keystone-redis.xml b/doc/common/tables/keystone-redis.xml
index e6af8412f8..920409dfdc 100644
--- a/doc/common/tables/keystone-redis.xml
+++ b/doc/common/tables/keystone-redis.xml
@@ -14,17 +14,6 @@
-
- [DEFAULT] |
-
-
- matchmaker_heartbeat_freq = 300 |
- (IntOpt) Heartbeat frequency. |
-
-
- matchmaker_heartbeat_ttl = 600 |
- (IntOpt) Heartbeat time-to-live. |
-
[matchmaker_redis] |
diff --git a/doc/common/tables/keystone-rpc.xml b/doc/common/tables/keystone-rpc.xml
index 56a03132e3..14d42ed304 100644
--- a/doc/common/tables/keystone-rpc.xml
+++ b/doc/common/tables/keystone-rpc.xml
@@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
- Description of configuration options for rpc
+ Description of RPC configuration options
@@ -18,8 +18,32 @@
[DEFAULT] |
- allowed_rpc_exception_modules = keystone.openstack.common.exception, nova.exception, cinder.exception, exceptions |
- (ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call. |
+ matchmaker_heartbeat_freq = 300 |
+ (IntOpt) Heartbeat frequency. |
+
+
+ matchmaker_heartbeat_ttl = 600 |
+ (IntOpt) Heartbeat time-to-live. |
+
+
+ rpc_backend = rabbit |
+ (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
+
+
+ rpc_cast_timeout = 30 |
+ (IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq. |
+
+
+ rpc_conn_pool_size = 30 |
+ (IntOpt) Size of RPC connection pool. |
+
+
+ rpc_response_timeout = 60 |
+ (IntOpt) Seconds to wait for a response from a call. |
+
+
+ rpc_thread_pool_size = 64 |
+ (IntOpt) Size of RPC greenthread pool. |
diff --git a/doc/common/tables/keystone-ssl.xml b/doc/common/tables/keystone-ssl.xml
deleted file mode 100644
index dd10a555cb..0000000000
--- a/doc/common/tables/keystone-ssl.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
- Description of SSL configuration options
-
-
-
-
- Configuration option = Default value |
- Description |
-
-
-
-
- [signing] |
-
-
- ca_certs = /etc/keystone/ssl/certs/ca.pem |
- (StrOpt) Path of the CA for token signing. |
-
-
- ca_key = /etc/keystone/ssl/private/cakey.pem |
- (StrOpt) Path of the CA key for token signing. |
-
-
- cert_subject = /C=US/ST=Unset/L=Unset/O=Unset/CN=www.example.com |
- (StrOpt) Certificate subject (auto generated certificate) for token signing. |
-
-
- certfile = /etc/keystone/ssl/certs/signing_cert.pem |
- (StrOpt) Path of the certfile for token signing. For non-production environments, you may be interested in using `keystone-manage pki_setup` to generate self-signed certificates. |
-
-
- key_size = 2048 |
- (IntOpt) Key size (in bits) for token signing cert (auto generated certificate). |
-
-
- keyfile = /etc/keystone/ssl/private/signing_key.pem |
- (StrOpt) Path of the keyfile for token signing. |
-
-
- token_format = None |
- (StrOpt) Deprecated in favor of provider in the [token] section. |
-
-
- valid_days = 3650 |
- (IntOpt) Days the token signing cert is valid for (auto generated certificate). |
-
-
- [ssl] |
-
-
- ca_certs = /etc/keystone/ssl/certs/ca.pem |
- (StrOpt) Path of the ca cert file for SSL. |
-
-
- ca_key = /etc/keystone/ssl/private/cakey.pem |
- (StrOpt) Path of the CA key file for SSL. |
-
-
- cert_required = False |
- (BoolOpt) Require client certificate. |
-
-
- cert_subject = /C=US/ST=Unset/L=Unset/O=Unset/CN=localhost |
- (StrOpt) SSL certificate subject (auto generated certificate). |
-
-
- certfile = /etc/keystone/ssl/certs/keystone.pem |
- (StrOpt) Path of the certfile for SSL. For non-production environments, you may be interested in using `keystone-manage ssl_setup` to generate self-signed certificates. |
-
-
- enable = False |
- (BoolOpt) Toggle for SSL support on the Keystone eventlet servers. |
-
-
- key_size = 1024 |
- (IntOpt) SSL key length (in bits) (auto generated certificate). |
-
-
- keyfile = /etc/keystone/ssl/private/keystonekey.pem |
- (StrOpt) Path of the keyfile for SSL. |
-
-
- valid_days = 3650 |
- (IntOpt) Days the certificate is valid for once signed (auto generated certificate). |
-
-
-
-
diff --git a/doc/common/tables/keystone-testing.xml b/doc/common/tables/keystone-testing.xml
new file mode 100644
index 0000000000..5b4f4aaa91
--- /dev/null
+++ b/doc/common/tables/keystone-testing.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ Description of testing configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ fake_rabbit = False |
+ (BoolOpt) If passed, use a fake RabbitMQ provider. |
+
+
+
+
diff --git a/doc/common/tables/neutron-amqp.xml b/doc/common/tables/neutron-amqp.xml
new file mode 100644
index 0000000000..23335c11c4
--- /dev/null
+++ b/doc/common/tables/neutron-amqp.xml
@@ -0,0 +1,46 @@
+
+
+
+
+ Description of AMQP configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ amqp_auto_delete = False |
+ (BoolOpt) Auto-delete queues in amqp. |
+
+
+ amqp_durable_queues = False |
+ (BoolOpt) Use durable queues in amqp. |
+
+
+ control_exchange = openstack |
+ (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid |
+
+
+ notification_driver = [] |
+ (MultiStrOpt) Driver or drivers to handle sending notifications. |
+
+
+ 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/neutron-api.xml b/doc/common/tables/neutron-api.xml
index 075a58a0e9..215168d2ee 100644
--- a/doc/common/tables/neutron-api.xml
+++ b/doc/common/tables/neutron-api.xml
@@ -37,6 +37,10 @@
api_paste_config = api-paste.ini |
(StrOpt) The API paste config file to use |
+
+ backlog = 4096 |
+ (IntOpt) Number of backlog requests to configure the socket with |
+
max_header_line = 16384 |
(IntOpt) Max header line to accommodate large tokens |
@@ -49,6 +53,10 @@
pagination_max_limit = -1 |
(StrOpt) The maximum number of items returned in a single response, value was 'infinite' or negative integer means no limit |
+
+ retry_until_window = 30 |
+ (IntOpt) Number of seconds to keep retrying to listen |
+
run_external_periodic_tasks = True |
(BoolOpt) Some periodic tasks can be run in a separate process. Should we run them here? |
@@ -57,6 +65,10 @@
service_plugins = |
(ListOpt) The service plugins Neutron will use |
+
+ tcp_keepidle = 600 |
+ (IntOpt) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X. |
+
[service_providers] |
diff --git a/doc/common/tables/neutron-auth_token.xml b/doc/common/tables/neutron-auth_token.xml
index 4bd36cbe79..abbe3639d4 100644
--- a/doc/common/tables/neutron-auth_token.xml
+++ b/doc/common/tables/neutron-auth_token.xml
@@ -14,13 +14,6 @@
-
- [DEFAULT] |
-
-
- memcached_servers = None |
- (ListOpt) Memcached servers or None for in process cache. |
-
[keystone_authtoken] |
@@ -124,10 +117,6 @@
memcache_security_strategy = None |
(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization. |
-
- memcached_servers = None |
- (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
-
revocation_cache_time = 10 |
(IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. |
diff --git a/doc/common/tables/neutron-bigswitch.xml b/doc/common/tables/neutron-bigswitch.xml
index ebbea11454..88da7aca39 100644
--- a/doc/common/tables/neutron-bigswitch.xml
+++ b/doc/common/tables/neutron-bigswitch.xml
@@ -109,7 +109,7 @@
(IntOpt) Time between verifications that the backend controller database is consistent with Neutron. (0 to disable) |
- neutron_id = neutron-localhost |
+ neutron_id = neutron-shock |
(StrOpt) User defined identifier for this Neutron deployment |
diff --git a/doc/common/tables/neutron-common.xml b/doc/common/tables/neutron-common.xml
index 92999117b9..541e58424d 100644
--- a/doc/common/tables/neutron-common.xml
+++ b/doc/common/tables/neutron-common.xml
@@ -125,10 +125,6 @@
dhcp_lease_duration = 86400 |
(IntOpt) DHCP lease duration (in seconds). Use -1 to tell dnsmasq to use infinite lease times. |
-
- disable_process_locking = False |
- (BoolOpt) Whether to disable inter-process locks |
-
endpoint_type = publicURL |
(StrOpt) Network service endpoint type to pull from the keystone catalog |
@@ -173,6 +169,10 @@
max_subnet_host_routes = 20 |
(IntOpt) Maximum number of host routes per subnet |
+
+ memcached_servers = None |
+ (ListOpt) Memcached servers or None for in process cache. |
+
periodic_fuzzy_delay = 5 |
(IntOpt) Range of seconds to randomly delay when starting the periodic task scheduler to reduce stampeding. (Disable by setting to 0) |
@@ -234,6 +234,13 @@
admin_password = None |
(StrOpt) ESM admin password. |
+
+ [keystone_authtoken] |
+
+
+ memcached_servers = None |
+ (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
+
diff --git a/doc/common/tables/neutron-debug.xml b/doc/common/tables/neutron-debug.xml
new file mode 100644
index 0000000000..f25facc6ab
--- /dev/null
+++ b/doc/common/tables/neutron-debug.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ Description of logging configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ backdoor_port = None |
+ (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
+
+
+ disable_process_locking = False |
+ (BoolOpt) Whether to disable inter-process locks |
+
+
+
+
diff --git a/doc/common/tables/neutron-ml2_bigswitch.xml b/doc/common/tables/neutron-ml2_bigswitch.xml
index a2c09a6b72..fc927fed3c 100644
--- a/doc/common/tables/neutron-ml2_bigswitch.xml
+++ b/doc/common/tables/neutron-ml2_bigswitch.xml
@@ -109,7 +109,7 @@
(IntOpt) Time between verifications that the backend controller database is consistent with Neutron. (0 to disable) |
- neutron_id = neutron-localhost |
+ neutron_id = neutron-shock |
(StrOpt) User defined identifier for this Neutron deployment |
diff --git a/doc/common/tables/neutron-redis.xml b/doc/common/tables/neutron-redis.xml
index 82bd37cf3f..b311def420 100644
--- a/doc/common/tables/neutron-redis.xml
+++ b/doc/common/tables/neutron-redis.xml
@@ -29,6 +29,13 @@
port = 6379 |
(IntOpt) Use this port to connect to redis host. |
+
+ [matchmaker_ring] |
+
+
+ ringfile = /etc/oslo/matchmaker_ring.json |
+ (StrOpt) Matchmaker ring file (JSON). |
+
diff --git a/doc/common/tables/neutron-rpc.xml b/doc/common/tables/neutron-rpc.xml
index 617b3ff66e..92d975c24d 100644
--- a/doc/common/tables/neutron-rpc.xml
+++ b/doc/common/tables/neutron-rpc.xml
@@ -17,18 +17,6 @@
[DEFAULT] |
-
- amqp_auto_delete = False |
- (BoolOpt) Auto-delete queues in amqp. |
-
-
- amqp_durable_queues = False |
- (BoolOpt) Use durable queues in amqp. |
-
-
- control_exchange = neutron |
- (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
-
matchmaker_heartbeat_freq = 300 |
(IntOpt) Heartbeat frequency. |
@@ -38,8 +26,8 @@
(IntOpt) Heartbeat time-to-live. |
- rpc_backend = rabbit |
- (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
+ rpc_backend = neutron.openstack.common.rpc.impl_kombu |
+ (StrOpt) The messaging module to use, defaults to kombu. |
rpc_cast_timeout = 30 |
@@ -47,24 +35,20 @@
rpc_conn_pool_size = 30 |
- (IntOpt) Size of RPC connection pool. |
+ (IntOpt) Size of RPC connection pool |
rpc_response_timeout = 60 |
- (IntOpt) Seconds to wait for a response from a call. |
+ (IntOpt) Seconds to wait for a response from call or multicall |
rpc_thread_pool_size = 64 |
- (IntOpt) Size of RPC greenthread pool. |
+ (IntOpt) Size of RPC thread pool |
rpc_workers = 0 |
(IntOpt) Number of RPC worker processes for service |
-
- 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. |
-
[AGENT] |
@@ -72,13 +56,6 @@
rpc_support_old_agents = False |
(BoolOpt) Enable server RPC compatibility with old agents |
-
- [matchmaker_ring] |
-
-
- ringfile = /etc/oslo/matchmaker_ring.json |
- (StrOpt) Matchmaker ring file (JSON). |
-
diff --git a/doc/common/tables/neutron-testing.xml b/doc/common/tables/neutron-testing.xml
index 1a8846b0f9..f3fe1630b1 100644
--- a/doc/common/tables/neutron-testing.xml
+++ b/doc/common/tables/neutron-testing.xml
@@ -17,13 +17,9 @@
[DEFAULT] |
-
- backdoor_port = None |
- (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
-
fake_rabbit = False |
- (BoolOpt) If passed, use a fake RabbitMQ provider. |
+ (BoolOpt) If passed, use a fake RabbitMQ provider |
diff --git a/doc/common/tables/nova-amqp.xml b/doc/common/tables/nova-amqp.xml
new file mode 100644
index 0000000000..521a7eb8d2
--- /dev/null
+++ b/doc/common/tables/nova-amqp.xml
@@ -0,0 +1,50 @@
+
+
+
+
+ Description of AMQP configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ amqp_auto_delete = False |
+ (BoolOpt) Auto-delete queues in amqp. |
+
+
+ amqp_durable_queues = False |
+ (BoolOpt) Use durable queues in amqp. |
+
+
+ control_exchange = openstack |
+ (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
+
+
+ default_publisher_id = None |
+ (StrOpt) Default publisher_id for outgoing notifications |
+
+
+ notification_driver = [] |
+ (MultiStrOpt) Driver or drivers to handle sending notifications. |
+
+
+ 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/nova-api.xml b/doc/common/tables/nova-api.xml
index 176ae18976..b5f5c17d65 100644
--- a/doc/common/tables/nova-api.xml
+++ b/doc/common/tables/nova-api.xml
@@ -17,6 +17,10 @@
[DEFAULT] |
+
+ api_paste_config = api-paste.ini |
+ (StrOpt) File name for the paste.deploy config for nova-api |
+
api_rate_limit = False |
(BoolOpt) Whether to use per-user rate limiting for the api. This option is only used by v2 api. Rate limiting is removed from v3 api. |
@@ -89,10 +93,22 @@
snapshot_name_template = snapshot-%s |
(StrOpt) Template string to be used to generate snapshot names |
+
+ tcp_keepidle = 600 |
+ (IntOpt) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X. |
+
use_forwarded_for = False |
(BoolOpt) Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy. |
+
+ wsgi_default_pool_size = 1000 |
+ (IntOpt) Size of the pool of greenthreads used by wsgi |
+
+
+ wsgi_log_format = %(client_ip)s "%(request_line)s" status: %(status_code)s len: %(body_length)s time: %(wall_seconds).7f |
+ (StrOpt) A python format string that is used as the template to generate log lines. The following values can be formatted into it: client_ip, date_time, request_line, status_code, body_length, wall_seconds. |
+
diff --git a/doc/common/tables/nova-auth_token.xml b/doc/common/tables/nova-auth_token.xml
index 57c828df61..b886d73789 100644
--- a/doc/common/tables/nova-auth_token.xml
+++ b/doc/common/tables/nova-auth_token.xml
@@ -117,10 +117,6 @@
memcache_security_strategy = None |
(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization. |
-
- memcached_servers = None |
- (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
-
revocation_cache_time = 10 |
(IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. |
diff --git a/doc/common/tables/nova-ca.xml b/doc/common/tables/nova-ca.xml
index d29b16d9af..30f4db5173 100644
--- a/doc/common/tables/nova-ca.xml
+++ b/doc/common/tables/nova-ca.xml
@@ -49,6 +49,18 @@
project_cert_subject = /C=US/ST=California/O=OpenStack/OU=NovaDev/CN=project-ca-%.16s-%s |
(StrOpt) Subject for certificate for projects, %s for project, timestamp |
+
+ ssl_ca_file = None |
+ (StrOpt) CA certificate file to use to verify connecting clients |
+
+
+ ssl_cert_file = None |
+ (StrOpt) SSL certificate of API server |
+
+
+ ssl_key_file = None |
+ (StrOpt) SSL private key of API server |
+
use_project_ca = False |
(BoolOpt) Should we use a CA for each project? |
diff --git a/doc/common/tables/nova-common.xml b/doc/common/tables/nova-common.xml
index c0e61b201c..4fdcefda16 100644
--- a/doc/common/tables/nova-common.xml
+++ b/doc/common/tables/nova-common.xml
@@ -33,10 +33,6 @@
consoleauth_topic = consoleauth |
(StrOpt) The topic console auth proxy nodes listen on |
-
- disable_process_locking = False |
- (BoolOpt) Enables or disables inter-process locks. |
-
host = localhost |
(StrOpt) Name of this node. This can be an opaque identifier. It is not necessarily a hostname, FQDN, or IP address. However, the node name must be valid within an AMQP key, and if using ZeroMQ, a valid hostname, FQDN, or IP address |
@@ -53,14 +49,6 @@
my_ip = 10.0.0.1 |
(StrOpt) IP address of this host |
-
- notification_driver = [] |
- (MultiStrOpt) Driver or drivers to handle sending notifications. |
-
-
- notification_topics = notifications |
- (ListOpt) AMQP topic used for OpenStack notifications. |
-
notify_api_faults = False |
(BoolOpt) If set, send api.fault notifications on caught exceptions in the API service. |
@@ -94,8 +82,11 @@
(StrOpt) Explicitly specify the temporary working directory |
- 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. |
+ [keystone_authtoken] |
+
+
+ memcached_servers = None |
+ (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
diff --git a/doc/common/tables/nova-compute.xml b/doc/common/tables/nova-compute.xml
index 9ffb94747c..407d697ec9 100644
--- a/doc/common/tables/nova-compute.xml
+++ b/doc/common/tables/nova-compute.xml
@@ -57,10 +57,6 @@
default_notification_level = INFO |
(StrOpt) Default notification level for outgoing notifications |
-
- default_publisher_id = None |
- (StrOpt) Default publisher_id for outgoing notifications |
-
enable_instance_password = True |
(BoolOpt) Enables returning of the instance password by the relevant server API calls such as create, rebuild or rescue, If the hypervisor does not support password injection then the password returned will not be correct |
diff --git a/doc/common/tables/nova-debug.xml b/doc/common/tables/nova-debug.xml
new file mode 100644
index 0000000000..29b6f8cf37
--- /dev/null
+++ b/doc/common/tables/nova-debug.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ Description of logging configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ backdoor_port = None |
+ (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
+
+
+ disable_process_locking = False |
+ (BoolOpt) Enables or disables inter-process locks. |
+
+
+
+
diff --git a/doc/common/tables/nova-kombu.xml b/doc/common/tables/nova-kombu.xml
deleted file mode 100644
index 3ccfb27a9c..0000000000
--- a/doc/common/tables/nova-kombu.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
- Description of kombu configuration options
-
-
-
-
- Configuration option = Default value |
- Description |
-
-
-
-
- [DEFAULT] |
-
-
- kombu_reconnect_delay = 1.0 |
- (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
-
-
- kombu_ssl_ca_certs = |
- (StrOpt) SSL certification authority file (valid only if SSL enabled). |
-
-
- kombu_ssl_certfile = |
- (StrOpt) SSL cert file (valid only if SSL enabled). |
-
-
- kombu_ssl_keyfile = |
- (StrOpt) SSL key file (valid only if SSL enabled). |
-
-
- kombu_ssl_version = |
- (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions. |
-
-
-
-
diff --git a/doc/common/tables/nova-rabbitmq.xml b/doc/common/tables/nova-rabbitmq.xml
index 037e5f1760..510206dbf6 100644
--- a/doc/common/tables/nova-rabbitmq.xml
+++ b/doc/common/tables/nova-rabbitmq.xml
@@ -17,6 +17,26 @@
[DEFAULT] |
+
+ kombu_reconnect_delay = 1.0 |
+ (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
+
+
+ kombu_ssl_ca_certs = |
+ (StrOpt) SSL certification authority file (valid only if SSL enabled). |
+
+
+ kombu_ssl_certfile = |
+ (StrOpt) SSL cert file (valid only if SSL enabled). |
+
+
+ kombu_ssl_keyfile = |
+ (StrOpt) SSL key file (valid only if SSL enabled). |
+
+
+ kombu_ssl_version = |
+ (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions. |
+
rabbit_ha_queues = False |
(BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. |
diff --git a/doc/common/tables/nova-redis.xml b/doc/common/tables/nova-redis.xml
index a6ceecb471..adcadf5a61 100644
--- a/doc/common/tables/nova-redis.xml
+++ b/doc/common/tables/nova-redis.xml
@@ -29,6 +29,13 @@
port = 6379 |
(IntOpt) Use this port to connect to redis host. |
+
+ [matchmaker_ring] |
+
+
+ ringfile = /etc/oslo/matchmaker_ring.json |
+ (StrOpt) Matchmaker ring file (JSON). |
+
diff --git a/doc/common/tables/nova-rpc.xml b/doc/common/tables/nova-rpc.xml
index a89a4c4591..c501fa0aec 100644
--- a/doc/common/tables/nova-rpc.xml
+++ b/doc/common/tables/nova-rpc.xml
@@ -17,18 +17,6 @@
[DEFAULT] |
-
- amqp_auto_delete = False |
- (BoolOpt) Auto-delete queues in amqp. |
-
-
- amqp_durable_queues = False |
- (BoolOpt) Use durable queues in amqp. |
-
-
- control_exchange = openstack |
- (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
-
matchmaker_heartbeat_freq = 300 |
(IntOpt) Heartbeat frequency. |
@@ -64,13 +52,6 @@
rpc_driver_queue_base = cells.intercell |
(StrOpt) Base queue name to use when communicating between cells. Various topics by message type will be appended to this. |
-
- [matchmaker_ring] |
-
-
- ringfile = /etc/oslo/matchmaker_ring.json |
- (StrOpt) Matchmaker ring file (JSON). |
-
[upgrade_levels] |
diff --git a/doc/common/tables/nova-rpc_all.xml b/doc/common/tables/nova-rpc_all.xml
deleted file mode 100644
index 2f84dc4019..0000000000
--- a/doc/common/tables/nova-rpc_all.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
- Description of all RPC configuration options
-
-
-
-
- Configuration option = Default value |
- Description |
-
-
-
-
- [DEFAULT] |
-
-
- amqp_auto_delete = False |
- (BoolOpt) Auto-delete queues in amqp. |
-
-
- amqp_durable_queues = False |
- (BoolOpt) Use durable queues in amqp. |
-
-
- control_exchange = openstack |
- (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
-
-
- kombu_reconnect_delay = 1.0 |
- (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
-
-
- kombu_ssl_ca_certs = |
- (StrOpt) SSL certification authority file (valid only if SSL enabled). |
-
-
- kombu_ssl_certfile = |
- (StrOpt) SSL cert file (valid only if SSL enabled). |
-
-
- kombu_ssl_keyfile = |
- (StrOpt) SSL key file (valid only if SSL enabled). |
-
-
- kombu_ssl_version = |
- (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions. |
-
-
- matchmaker_heartbeat_freq = 300 |
- (IntOpt) Heartbeat frequency. |
-
-
- matchmaker_heartbeat_ttl = 600 |
- (IntOpt) Heartbeat time-to-live. |
-
-
- qpid_heartbeat = 60 |
- (IntOpt) Seconds between connection keepalive heartbeats. |
-
-
- qpid_hostname = localhost |
- (StrOpt) Qpid broker hostname. |
-
-
- qpid_hosts = $qpid_hostname:$qpid_port |
- (ListOpt) Qpid HA cluster host:port pairs. |
-
-
- qpid_password = |
- (StrOpt) Password for Qpid connection. |
-
-
- qpid_port = 5672 |
- (IntOpt) Qpid broker port. |
-
-
- qpid_protocol = tcp |
- (StrOpt) Transport to use, either 'tcp' or 'ssl'. |
-
-
- qpid_receiver_capacity = 1 |
- (IntOpt) The number of prefetched messages held by receiver. |
-
-
- qpid_sasl_mechanisms = |
- (StrOpt) Space separated list of SASL mechanisms to use for auth. |
-
-
- qpid_tcp_nodelay = True |
- (BoolOpt) Whether to disable the Nagle algorithm. |
-
-
- qpid_topology_version = 1 |
- (IntOpt) The qpid topology version to use. Version 1 is what was originally used by impl_qpid. Version 2 includes some backwards-incompatible changes that allow broker federation to work. Users should update to version 2 when they are able to take everything down, as it requires a clean break. |
-
-
- qpid_username = |
- (StrOpt) Username for Qpid connection. |
-
-
- rabbit_ha_queues = False |
- (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. |
-
-
- rabbit_host = localhost |
- (StrOpt) The RabbitMQ broker address where a single node is used. |
-
-
- rabbit_hosts = $rabbit_host:$rabbit_port |
- (ListOpt) RabbitMQ HA cluster host:port pairs. |
-
-
- rabbit_login_method = AMQPLAIN |
- (StrOpt) the RabbitMQ login method |
-
-
- rabbit_max_retries = 0 |
- (IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count). |
-
-
- rabbit_password = guest |
- (StrOpt) The RabbitMQ password. |
-
-
- rabbit_port = 5672 |
- (IntOpt) The RabbitMQ broker port where a single node is used. |
-
-
- rabbit_retry_backoff = 2 |
- (IntOpt) How long to backoff for between retries when connecting to RabbitMQ. |
-
-
- rabbit_retry_interval = 1 |
- (IntOpt) How frequently to retry connecting with RabbitMQ. |
-
-
- rabbit_use_ssl = False |
- (BoolOpt) Connect over SSL for RabbitMQ. |
-
-
- rabbit_userid = guest |
- (StrOpt) The RabbitMQ userid. |
-
-
- rabbit_virtual_host = / |
- (StrOpt) The RabbitMQ virtual host. |
-
-
- rpc_backend = rabbit |
- (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. |
-
-
- rpc_cast_timeout = 30 |
- (IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq. |
-
-
- rpc_conn_pool_size = 30 |
- (IntOpt) Size of RPC connection pool. |
-
-
- rpc_response_timeout = 60 |
- (IntOpt) Seconds to wait for a response from a call. |
-
-
- rpc_thread_pool_size = 64 |
- (IntOpt) Size of RPC greenthread pool. |
-
-
- rpc_zmq_bind_address = * |
- (StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address. |
-
-
- rpc_zmq_contexts = 1 |
- (IntOpt) Number of ZeroMQ contexts, defaults to 1. |
-
-
- rpc_zmq_host = localhost |
- (StrOpt) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova. |
-
-
- rpc_zmq_ipc_dir = /var/run/openstack |
- (StrOpt) Directory for holding IPC sockets. |
-
-
- rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost |
- (StrOpt) MatchMaker driver. |
-
-
- rpc_zmq_port = 9501 |
- (IntOpt) ZeroMQ receiver listening port. |
-
-
- rpc_zmq_topic_backlog = None |
- (IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited. |
-
-
- [cells] |
-
-
- rpc_driver_queue_base = cells.intercell |
- (StrOpt) Base queue name to use when communicating between cells. Various topics by message type will be appended to this. |
-
-
- [matchmaker_ring] |
-
-
- ringfile = /etc/oslo/matchmaker_ring.json |
- (StrOpt) Matchmaker ring file (JSON). |
-
-
- [upgrade_levels] |
-
-
- baseapi = None |
- (StrOpt) Set a version cap for messages sent to the base api in any service |
-
-
-
-
diff --git a/doc/common/tables/nova-testing.xml b/doc/common/tables/nova-testing.xml
index 0b0b25a931..aacb2e9c9c 100644
--- a/doc/common/tables/nova-testing.xml
+++ b/doc/common/tables/nova-testing.xml
@@ -17,10 +17,6 @@
[DEFAULT] |
-
- backdoor_port = None |
- (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> 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. |
-
fake_call = False |
(BoolOpt) If True, skip using the queue and make local calls |
diff --git a/doc/common/tables/nova-wsgi.xml b/doc/common/tables/nova-wsgi.xml
deleted file mode 100644
index a2f3f8e315..0000000000
--- a/doc/common/tables/nova-wsgi.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
- Description of WSGI configuration options
-
-
-
-
- Configuration option = Default value |
- Description |
-
-
-
-
- [DEFAULT] |
-
-
- api_paste_config = api-paste.ini |
- (StrOpt) File name for the paste.deploy config for nova-api |
-
-
- ssl_ca_file = None |
- (StrOpt) CA certificate file to use to verify connecting clients |
-
-
- ssl_cert_file = None |
- (StrOpt) SSL certificate of API server |
-
-
- ssl_key_file = None |
- (StrOpt) SSL private key of API server |
-
-
- tcp_keepidle = 600 |
- (IntOpt) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X. |
-
-
- wsgi_default_pool_size = 1000 |
- (IntOpt) Size of the pool of greenthreads used by wsgi |
-
-
- wsgi_log_format = %(client_ip)s "%(request_line)s" status: %(status_code)s len: %(body_length)s time: %(wall_seconds).7f |
- (StrOpt) A python format string that is used as the template to generate log lines. The following values can be formatted into it: client_ip, date_time, request_line, status_code, body_length, wall_seconds. |
-
-
-
-
diff --git a/doc/common/tables/sahara-amqp.xml b/doc/common/tables/sahara-amqp.xml
index a24a65a506..b4874aaeae 100644
--- a/doc/common/tables/sahara-amqp.xml
+++ b/doc/common/tables/sahara-amqp.xml
@@ -25,6 +25,10 @@
amqp_durable_queues = False |
(BoolOpt) Use durable queues in amqp. |
+
+ control_exchange = openstack |
+ (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
+
notification_driver = [] |
(MultiStrOpt) Driver or drivers to handle sending notifications. |
@@ -41,6 +45,10 @@
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/sahara-auth_token.xml b/doc/common/tables/sahara-auth_token.xml
index 985a9fdf58..25f7fc158a 100644
--- a/doc/common/tables/sahara-auth_token.xml
+++ b/doc/common/tables/sahara-auth_token.xml
@@ -117,10 +117,6 @@
memcache_security_strategy = None |
(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization. |
-
- memcached_servers = None |
- (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
-
revocation_cache_time = 10 |
(IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. |
diff --git a/doc/common/tables/sahara-common.xml b/doc/common/tables/sahara-common.xml
index 356d49b8dd..974a3fd6e0 100644
--- a/doc/common/tables/sahara-common.xml
+++ b/doc/common/tables/sahara-common.xml
@@ -30,10 +30,6 @@
compute2 /rack2
compute3 /rack2
-
- control_exchange = openstack |
- (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. |
-
detach_volume_timeout = 300 |
(IntOpt) Timeout for detaching volumes from instance (in seconds). |
@@ -132,10 +128,6 @@
node2 /rack2
node3 /rack2
-
- 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. |
-
use_floating_ips = True |
(BoolOpt) If set to True, Sahara will use floating IPs to communicate with instances. To make sure that all instances have floating IPs assigned in Nova Network set "auto_assign_floating_ip=True" in nova.conf. If Neutron is used for networking, make sure that all Node Groups have "floating_ip_pool" parameter defined. |
@@ -159,6 +151,13 @@
use_local = True |
(BoolOpt) Perform sahara-conductor operations locally. |
+
+ [keystone_authtoken] |
+
+
+ memcached_servers = None |
+ (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
+
diff --git a/doc/common/tables/sahara-debug.xml b/doc/common/tables/sahara-debug.xml
index 5f42abaf5f..3c49dc058e 100644
--- a/doc/common/tables/sahara-debug.xml
+++ b/doc/common/tables/sahara-debug.xml
@@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
- Description of debug configuration options
+ Description of logging configuration options
@@ -17,18 +17,10 @@
[DEFAULT] |
-
- debug = False |
- (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
-
disable_process_locking = False |
(BoolOpt) Enables or disables inter-process locks. |
-
- fake_rabbit = False |
- (BoolOpt) If passed, use a fake RabbitMQ provider. |
-
diff --git a/doc/common/tables/sahara-logging.xml b/doc/common/tables/sahara-logging.xml
index ae50b76d86..43104b2e20 100644
--- a/doc/common/tables/sahara-logging.xml
+++ b/doc/common/tables/sahara-logging.xml
@@ -17,6 +17,10 @@
[DEFAULT] |
+
+ debug = False |
+ (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
+
default_log_levels = amqplib=WARN, qpid.messaging=INFO, stevedore=INFO, eventlet.wsgi.server=WARN, sqlalchemy=WARN, boto=WARN, suds=INFO, keystone=INFO, paramiko=WARN, requests=WARN, iso8601=WARN |
(ListOpt) List of logger=LEVEL pairs. |
diff --git a/doc/common/tables/sahara-rabbitmq.xml b/doc/common/tables/sahara-rabbitmq.xml
index ca6fa46a35..cab0e3d892 100644
--- a/doc/common/tables/sahara-rabbitmq.xml
+++ b/doc/common/tables/sahara-rabbitmq.xml
@@ -17,6 +17,26 @@
[DEFAULT] |
+
+ kombu_reconnect_delay = 1.0 |
+ (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
+
+
+ kombu_ssl_ca_certs = |
+ (StrOpt) SSL certification authority file (valid only if SSL enabled). |
+
+
+ kombu_ssl_certfile = |
+ (StrOpt) SSL cert file (valid only if SSL enabled). |
+
+
+ kombu_ssl_keyfile = |
+ (StrOpt) SSL key file (valid only if SSL enabled). |
+
+
+ kombu_ssl_version = |
+ (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions. |
+
rabbit_ha_queues = False |
(BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. |
diff --git a/doc/common/tables/sahara-rpc.xml b/doc/common/tables/sahara-rpc.xml
index 858bcdc482..5f48d92cb3 100644
--- a/doc/common/tables/sahara-rpc.xml
+++ b/doc/common/tables/sahara-rpc.xml
@@ -17,26 +17,6 @@
[DEFAULT] |
-
- kombu_reconnect_delay = 1.0 |
- (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. |
-
-
- kombu_ssl_ca_certs = |
- (StrOpt) SSL certification authority file (valid only if SSL enabled). |
-
-
- kombu_ssl_certfile = |
- (StrOpt) SSL cert file (valid only if SSL enabled). |
-
-
- kombu_ssl_keyfile = |
- (StrOpt) SSL key file (valid only if SSL enabled). |
-
-
- kombu_ssl_version = |
- (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions. |
-
matchmaker_heartbeat_freq = 300 |
(IntOpt) Heartbeat frequency. |
diff --git a/doc/common/tables/sahara-testing.xml b/doc/common/tables/sahara-testing.xml
new file mode 100644
index 0000000000..521262f698
--- /dev/null
+++ b/doc/common/tables/sahara-testing.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ Description of testing configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ fake_rabbit = False |
+ (BoolOpt) If passed, use a fake RabbitMQ provider. |
+
+
+
+
diff --git a/doc/common/tables/trove-amqp.xml b/doc/common/tables/trove-amqp.xml
index 436c539dd3..d14caf286c 100644
--- a/doc/common/tables/trove-amqp.xml
+++ b/doc/common/tables/trove-amqp.xml
@@ -38,24 +38,8 @@
(StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid |
- fake_rabbit = False |
- (BoolOpt) If passed, use a fake RabbitMQ provider |
-
-
- kombu_ssl_ca_certs = |
- (StrOpt) SSL certification authority file (valid only if SSL enabled) |
-
-
- kombu_ssl_certfile = |
- (StrOpt) SSL cert file (valid only if SSL enabled) |
-
-
- kombu_ssl_keyfile = |
- (StrOpt) SSL key file (valid only if SSL enabled) |
-
-
- kombu_ssl_version = |
- (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions |
+ default_publisher_id = $host |
+ (StrOpt) Default publisher_id for outgoing notifications |
notification_driver = [] |
diff --git a/doc/common/tables/trove-auth_token.xml b/doc/common/tables/trove-auth_token.xml
index 667af31cdd..b6c3c3194d 100644
--- a/doc/common/tables/trove-auth_token.xml
+++ b/doc/common/tables/trove-auth_token.xml
@@ -14,13 +14,6 @@
-
- [DEFAULT] |
-
-
- memcached_servers = None |
- (ListOpt) Memcached servers or None for in process cache. |
-
[keystone_authtoken] |
@@ -124,10 +117,6 @@
memcache_security_strategy = None |
(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization. |
-
- memcached_servers = None |
- (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
-
revocation_cache_time = 10 |
(IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. |
diff --git a/doc/common/tables/trove-common.xml b/doc/common/tables/trove-common.xml
index 27328a0bc8..2f63849105 100644
--- a/doc/common/tables/trove-common.xml
+++ b/doc/common/tables/trove-common.xml
@@ -41,10 +41,6 @@
default_password_length = 36 |
(IntOpt) Character length of generated passwords. |
-
- default_publisher_id = $host |
- (StrOpt) Default publisher_id for outgoing notifications |
-
expected_filetype_suffixes = json |
(ListOpt) Filetype endings not to be reattached to an ID by the utils method correct_id_with_req. |
@@ -57,6 +53,10 @@
lock_path = None |
(StrOpt) Directory to use for lock files. |
+
+ memcached_servers = None |
+ (ListOpt) Memcached servers or None for in process cache. |
+
pybasedir = /usr/lib/python/site-packages/trove/trove |
(StrOpt) Directory where the Trove python module is installed. |
@@ -77,6 +77,13 @@
usage_timeout = 600 |
(IntOpt) Maximum time (in seconds) to wait for a Guest to become active. |
+
+ [keystone_authtoken] |
+
+
+ memcached_servers = None |
+ (ListOpt) Optionally specify a list of memcached server(s) to use for caching. If left undefined, tokens will instead be cached in-process. |
+
diff --git a/doc/common/tables/trove-debug.xml b/doc/common/tables/trove-debug.xml
index fa395bdae4..95642bfa1a 100644
--- a/doc/common/tables/trove-debug.xml
+++ b/doc/common/tables/trove-debug.xml
@@ -4,7 +4,7 @@
generated and your changes will be overwritten.
The tool to do so lives in openstack-doc-tools repository. -->
- Description of debug configuration options
+ Description of logging configuration options
@@ -25,10 +25,6 @@
backlog = 4096 |
(IntOpt) Number of backlog requests to configure the socket with |
-
- debug = False |
- (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
-
disable_process_locking = False |
(BoolOpt) Whether to disable inter-process locks |
diff --git a/doc/common/tables/trove-logging.xml b/doc/common/tables/trove-logging.xml
index fd492bb30d..7be60244bd 100644
--- a/doc/common/tables/trove-logging.xml
+++ b/doc/common/tables/trove-logging.xml
@@ -17,6 +17,10 @@
[DEFAULT] |
+
+ debug = False |
+ (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). |
+
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 |
(ListOpt) List of logger=LEVEL pairs. |
diff --git a/doc/common/tables/trove-rabbitmq.xml b/doc/common/tables/trove-rabbitmq.xml
index fe282f2a9a..19cab6c0b4 100644
--- a/doc/common/tables/trove-rabbitmq.xml
+++ b/doc/common/tables/trove-rabbitmq.xml
@@ -17,6 +17,22 @@
[DEFAULT] |
+
+ kombu_ssl_ca_certs = |
+ (StrOpt) SSL certification authority file (valid only if SSL enabled) |
+
+
+ kombu_ssl_certfile = |
+ (StrOpt) SSL cert file (valid only if SSL enabled) |
+
+
+ kombu_ssl_keyfile = |
+ (StrOpt) SSL key file (valid only if SSL enabled) |
+
+
+ kombu_ssl_version = |
+ (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some distributions |
+
rabbit_ha_queues = False |
(BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to wipe RabbitMQ database when changing this option. |
diff --git a/doc/common/tables/trove-testing.xml b/doc/common/tables/trove-testing.xml
new file mode 100644
index 0000000000..d70e90536c
--- /dev/null
+++ b/doc/common/tables/trove-testing.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ Description of testing configuration options
+
+
+
+
+ Configuration option = Default value |
+ Description |
+
+
+
+
+ [DEFAULT] |
+
+
+ fake_rabbit = False |
+ (BoolOpt) If passed, use a fake RabbitMQ provider |
+
+
+
+
diff --git a/doc/config-reference/block-storage/section_misc.xml b/doc/config-reference/block-storage/section_misc.xml
index 66222a91a9..6aac412af5 100644
--- a/doc/config-reference/block-storage/section_misc.xml
+++ b/doc/config-reference/block-storage/section_misc.xml
@@ -21,6 +21,11 @@
+
+
+
+
+
@@ -41,6 +46,8 @@
+
+
diff --git a/doc/config-reference/ch_databaseserviceconfigure.xml b/doc/config-reference/ch_databaseserviceconfigure.xml
index 828f5b48d8..84f5c61863 100644
--- a/doc/config-reference/ch_databaseserviceconfigure.xml
+++ b/doc/config-reference/ch_databaseserviceconfigure.xml
@@ -29,6 +29,7 @@
+
diff --git a/doc/config-reference/ch_dataprocessingserviceconfigure.xml b/doc/config-reference/ch_dataprocessingserviceconfigure.xml
index b6822278de..c32a3ba397 100644
--- a/doc/config-reference/ch_dataprocessingserviceconfigure.xml
+++ b/doc/config-reference/ch_dataprocessingserviceconfigure.xml
@@ -24,6 +24,7 @@
+
diff --git a/doc/config-reference/ch_identityconfigure.xml b/doc/config-reference/ch_identityconfigure.xml
index 48eeafb078..0e8966d17e 100644
--- a/doc/config-reference/ch_identityconfigure.xml
+++ b/doc/config-reference/ch_identityconfigure.xml
@@ -59,6 +59,7 @@ options. For installation prerequisites and step-by-step walkthroughs, see the
+
@@ -70,15 +71,14 @@ options. For installation prerequisites and step-by-step walkthroughs, see the
-
-
+
diff --git a/doc/config-reference/ch_imageservice.xml b/doc/config-reference/ch_imageservice.xml
index 9fe62f50a6..3b0e07904d 100644
--- a/doc/config-reference/ch_imageservice.xml
+++ b/doc/config-reference/ch_imageservice.xml
@@ -28,8 +28,6 @@
-
-
diff --git a/doc/config-reference/ch_orchestrationconfigure.xml b/doc/config-reference/ch_orchestrationconfigure.xml
index fdfdc2b782..99e085c0d6 100644
--- a/doc/config-reference/ch_orchestrationconfigure.xml
+++ b/doc/config-reference/ch_orchestrationconfigure.xml
@@ -25,6 +25,7 @@
+
diff --git a/doc/config-reference/ch_telemetryconfigure.xml b/doc/config-reference/ch_telemetryconfigure.xml
index 8e5a543f7c..79eb0c1676 100644
--- a/doc/config-reference/ch_telemetryconfigure.xml
+++ b/doc/config-reference/ch_telemetryconfigure.xml
@@ -39,9 +39,11 @@
+
+
diff --git a/doc/config-reference/compute/section_compute-options-reference.xml b/doc/config-reference/compute/section_compute-options-reference.xml
index 60f4a188c3..d7b3f29a9b 100644
--- a/doc/config-reference/compute/section_compute-options-reference.xml
+++ b/doc/config-reference/compute/section_compute-options-reference.xml
@@ -22,6 +22,7 @@
+
@@ -45,7 +46,6 @@
-
@@ -58,7 +58,6 @@
-
diff --git a/doc/config-reference/compute/section_rpc.xml b/doc/config-reference/compute/section_rpc.xml
index e9bbec74dc..457866812a 100644
--- a/doc/config-reference/compute/section_rpc.xml
+++ b/doc/config-reference/compute/section_rpc.xml
@@ -34,7 +34,6 @@
usage data is sixty seconds plus a random number of seconds from
zero to sixty.
-
Configure Qpid
@@ -87,6 +86,7 @@ qpid_password=password
Use these options to configure the
RabbitMQ and
Qpid messaging drivers.
+
diff --git a/doc/config-reference/image-service/section_image-service-api.xml b/doc/config-reference/image-service/section_image-service-api.xml
index ef607b006d..6c14ef9708 100644
--- a/doc/config-reference/image-service/section_image-service-api.xml
+++ b/doc/config-reference/image-service/section_image-service-api.xml
@@ -19,5 +19,4 @@
SSL and modifying WSGI settings are found below.
-
diff --git a/doc/config-reference/networking/section_networking-options-reference.xml b/doc/config-reference/networking/section_networking-options-reference.xml
index d242482fbe..0d2aa21eb6 100644
--- a/doc/config-reference/networking/section_networking-options-reference.xml
+++ b/doc/config-reference/networking/section_networking-options-reference.xml
@@ -46,6 +46,12 @@
+
+Logging
+Use the following options to alter debug settings.
+
+
+
DHCP agent
Use the following options to alter Database-related settings.
@@ -177,11 +183,4 @@ for your driver to change security group settings.
-
-WSGI
-Use the following options in the
-neutron.conf file to configure the WSGI layer.
-
-
-
diff --git a/doc/config-reference/networking/section_rpc-for-networking.xml b/doc/config-reference/networking/section_rpc-for-networking.xml
index dc1c88aba6..c2358199c0 100644
--- a/doc/config-reference/networking/section_rpc-for-networking.xml
+++ b/doc/config-reference/networking/section_rpc-for-networking.xml
@@ -117,7 +117,7 @@ qpid_protocol=ssl
ZeroMq messaging drivers:
-
+
diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
index ae19d2f20c..d984d88733 100644
--- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
@@ -1,17 +1,17 @@
amqp_auto_delete amqp
amqp_durable_queues amqp
api_paste_config api
-backdoor_port common
+backdoor_port debug
cinder_control_exchange exchange
collector_workers collector
-control_exchange exchange
+control_exchange amqp
database_connection database
-debug debug
+debug logging
default_log_levels logging
-disable_process_locking common
+disable_process_locking debug
dispatcher rpc
enable_new_services nova
-fake_rabbit rabbitmq
+fake_rabbit testing
fatal_deprecations logging
fatal_exception_format_errors logging
glance_control_exchange exchange
@@ -43,8 +43,8 @@ logging_context_format_string logging
logging_debug_format_suffix logging
logging_default_format_string logging
logging_exception_prefix logging
-matchmaker_heartbeat_freq redis
-matchmaker_heartbeat_ttl redis
+matchmaker_heartbeat_freq rpc
+matchmaker_heartbeat_ttl rpc
memcached_servers common
monkey_patch nova
monkey_patch_modules nova
@@ -92,18 +92,18 @@ rpc_cast_timeout rpc
rpc_conn_pool_size rpc
rpc_response_timeout rpc
rpc_thread_pool_size rpc
-rpc_zmq_bind_address rpc
-rpc_zmq_contexts rpc
-rpc_zmq_host rpc
-rpc_zmq_ipc_dir rpc
-rpc_zmq_matchmaker rpc
-rpc_zmq_port rpc
-rpc_zmq_topic_backlog rpc
+rpc_zmq_bind_address zeromq
+rpc_zmq_contexts zeromq
+rpc_zmq_host zeromq
+rpc_zmq_ipc_dir zeromq
+rpc_zmq_matchmaker zeromq
+rpc_zmq_port zeromq
+rpc_zmq_topic_backlog zeromq
sahara_control_exchange exchange
sample_source exchange
snapshot_name_template nova
syslog_log_facility logging
-transport_url rpc
+transport_url amqp
trove_control_exchange exchange
use_stderr logging
use_syslog logging
@@ -198,7 +198,7 @@ keystone_authtoken/insecure auth_token
keystone_authtoken/keyfile auth_token
keystone_authtoken/memcache_secret_key auth_token
keystone_authtoken/memcache_security_strategy auth_token
-keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/memcached_servers common
keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index fd46cca8b6..1bdf7725f4 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -1,13 +1,13 @@
allocated_capacity_weight_multiplier storage
allowed_direct_url_schemes images
-amqp_auto_delete rpc
-amqp_durable_queues rpc
+amqp_auto_delete amqp
+amqp_durable_queues amqp
api_paste_config api
api_rate_limit api
auth_strategy auth
available_devices block-device
az_cache_duration api
-backdoor_port api
+backdoor_port debug
backup_api_class backups
backup_ceph_chunk_size backups_ceph
backup_ceph_conf backups_ceph
@@ -41,7 +41,7 @@ cinder_smis_config_file fujitsu_eternus_dx
cloned_volume_same_az zones
compute_api_class common
consistencygroup_api_class common
-control_exchange rpc
+control_exchange amqp
coraid_esm_address coraid
coraid_group coraid
coraid_password coraid
@@ -56,10 +56,10 @@ db_driver database
debug logging
default_availability_zone common
default_log_levels logging
-default_timeout rpc
+default_timeout api
default_volume_type common
destroy_empty_storage_group emc
-disable_process_locking common
+disable_process_locking debug
dpl_pool prophetstor_dpl
dpl_port prophetstor_dpl
driver_client_cert datera
@@ -77,7 +77,7 @@ eqlx_pool eqlx
eqlx_use_chap eqlx
expiry_thres_minutes netapp_7mode_nfs netapp_cdot_nfs
extra_capabilities api
-fake_rabbit rpc
+fake_rabbit testing
fatal_deprecations logging
fatal_exception_format_errors logging
fusionio_iocontrol_retry fusionio
@@ -163,11 +163,11 @@ iser_ip_address storage
iser_num_targets storage
iser_port storage
iser_target_prefix storage
-kombu_reconnect_delay rpc
-kombu_ssl_ca_certs rpc
-kombu_ssl_certfile rpc
-kombu_ssl_keyfile rpc
-kombu_ssl_version rpc
+kombu_reconnect_delay rabbitmq
+kombu_ssl_ca_certs rabbitmq
+kombu_ssl_certfile rabbitmq
+kombu_ssl_keyfile rabbitmq
+kombu_ssl_version rabbitmq
lio_initiator_iqns common
lock_path common
log_config_append logging
@@ -187,7 +187,7 @@ max_age quota
max_gigabytes storage
max_header_line api
max_luns_per_storage_group emc
-memcached_servers auth_token
+memcached_servers common
migration_create_volume_timeout_secs storage
monkey_patch common
monkey_patch_modules common
@@ -243,8 +243,8 @@ nfs_used_ratio storage_nfs
nimble_pool_name nimble
nimble_subnet_label nimble
no_snapshot_gb_quota common
-notification_driver rpc
-notification_topics rpc
+notification_driver amqp
+notification_topics amqp
nova_api_insecure compute
nova_ca_certificates_file compute
nova_catalog_admin_info compute
@@ -269,17 +269,17 @@ policy_default_rule common
policy_file common
publish_errors logging
pure_api_token pure
-qpid_heartbeat rpc
-qpid_hostname rpc
-qpid_hosts rpc
-qpid_password rpc
-qpid_port rpc
-qpid_protocol rpc
-qpid_receiver_capacity rpc
-qpid_sasl_mechanisms rpc
-qpid_tcp_nodelay rpc
-qpid_topology_version rpc
-qpid_username rpc
+qpid_heartbeat qpid
+qpid_hostname qpid
+qpid_hosts qpid
+qpid_password qpid
+qpid_port qpid
+qpid_protocol qpid
+qpid_receiver_capacity qpid
+qpid_sasl_mechanisms qpid
+qpid_tcp_nodelay qpid
+qpid_topology_version qpid
+qpid_username qpid
quota_backup_gigabytes quota
quota_backups quota
quota_consistencygroups quota
@@ -287,18 +287,18 @@ quota_driver quota
quota_gigabytes quota
quota_snapshots quota
quota_volumes quota
-rabbit_ha_queues rpc
-rabbit_host rpc
-rabbit_hosts rpc
-rabbit_login_method rpc
-rabbit_max_retries rpc
-rabbit_password rpc
-rabbit_port rpc
-rabbit_retry_backoff rpc
-rabbit_retry_interval rpc
-rabbit_use_ssl rpc
-rabbit_userid rpc
-rabbit_virtual_host rpc
+rabbit_ha_queues rabbitmq
+rabbit_host rabbitmq
+rabbit_hosts rabbitmq
+rabbit_login_method rabbitmq
+rabbit_max_retries rabbitmq
+rabbit_password rabbitmq
+rabbit_port rabbitmq
+rabbit_retry_backoff rabbitmq
+rabbit_retry_interval rabbitmq
+rabbit_use_ssl rabbitmq
+rabbit_userid rabbitmq
+rabbit_virtual_host rabbitmq
rados_connect_timeout storage_ceph
rbd_ceph_conf storage_ceph
rbd_flatten_volume_from_snapshot storage_ceph
@@ -318,13 +318,13 @@ rpc_cast_timeout rpc
rpc_conn_pool_size rpc
rpc_response_timeout rpc
rpc_thread_pool_size rpc
-rpc_zmq_bind_address rpc
-rpc_zmq_contexts rpc
-rpc_zmq_host rpc
-rpc_zmq_ipc_dir rpc
-rpc_zmq_matchmaker rpc
-rpc_zmq_port rpc
-rpc_zmq_topic_backlog rpc
+rpc_zmq_bind_address zeromq
+rpc_zmq_contexts zeromq
+rpc_zmq_host zeromq
+rpc_zmq_ipc_dir zeromq
+rpc_zmq_matchmaker zeromq
+rpc_zmq_port zeromq
+rpc_zmq_topic_backlog zeromq
run_external_periodic_tasks common
san_clustername san xiv
san_ip san prophetstor_dpl xiv
@@ -399,12 +399,12 @@ tcp_keepidle common
thres_avl_size_perc_start netapp_7mode_nfs netapp_cdot_nfs
thres_avl_size_perc_stop netapp_7mode_nfs netapp_cdot_nfs
transfer_api_class api
-transport_url rpc
+transport_url amqp
until_refresh common
use_default_quota_class quota
use_forwarded_for common
use_multipath_for_image_xfer images
-use_stderr common
+use_stderr logging
use_syslog logging
use_syslog_rfc_format logging
verbose logging
@@ -543,14 +543,14 @@ keystone_authtoken/insecure auth_token
keystone_authtoken/keyfile auth_token
keystone_authtoken/memcache_secret_key auth_token
keystone_authtoken/memcache_security_strategy auth_token
-keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/memcached_servers common
keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token
-matchmaker_redis/host rpc
-matchmaker_redis/password rpc
-matchmaker_redis/port rpc
-matchmaker_ring/ringfile rpc
+matchmaker_redis/host redis
+matchmaker_redis/password redis
+matchmaker_redis/port redis
+matchmaker_ring/ringfile redis
profiler/profiler_enabled profiler
profiler/trace_sqlalchemy profiler
ssl/ca_file ca
diff --git a/tools/autogenerate-config-flagmappings/glance.flagmappings b/tools/autogenerate-config-flagmappings/glance.flagmappings
index dfedf0cd47..f1f3e886ba 100644
--- a/tools/autogenerate-config-flagmappings/glance.flagmappings
+++ b/tools/autogenerate-config-flagmappings/glance.flagmappings
@@ -18,21 +18,21 @@ ca_file ca
cert_file ca
cleanup_scrubber imagecache
cleanup_scrubber_time imagecache
-control_exchange rabbitmq
+control_exchange amqp
data_api common
db_enforce_mysql_charset database
debug logging
default_log_levels logging
-default_publisher_id api
+default_publisher_id amqp
default_swift_reference swift
delayed_delete imagecache
-disable_process_locking common
+disable_process_locking debug
enable_v1_api api
enable_v1_registry api
enable_v2_api api
enable_v2_registry api
-eventlet_hub wsgi
-fake_rabbit rabbitmq
+eventlet_hub api
+fake_rabbit testing
fatal_deprecations logging
image_cache_dir imagecache
image_cache_driver imagecache
@@ -64,10 +64,10 @@ logging_context_format_string logging
logging_debug_format_suffix logging
logging_default_format_string logging
logging_exception_prefix logging
-matchmaker_heartbeat_freq matchmaker
-matchmaker_heartbeat_ttl matchmaker
-max_header_line wsgi
-memcached_servers auth_token
+matchmaker_heartbeat_freq rpc
+matchmaker_heartbeat_ttl rpc
+max_header_line api
+memcached_servers common
metadata_encryption_key common
metadata_source_path common
notification_driver amqp
@@ -111,11 +111,11 @@ registry_client_protocol registry
registry_client_timeout registry
registry_host registry
registry_port registry
-rpc_backend amqp
-rpc_cast_timeout zeromq
-rpc_conn_pool_size amqp
-rpc_response_timeout amqp
-rpc_thread_pool_size amqp
+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
rpc_zmq_contexts zeromq
rpc_zmq_host zeromq
@@ -133,7 +133,7 @@ swift_store_config_file swift
swift_store_key swift
swift_store_user swift
syslog_log_facility logging
-tcp_keepidle wsgi
+tcp_keepidle api
transport_url amqp
use_stderr logging
use_syslog logging
@@ -245,16 +245,16 @@ keystone_authtoken/insecure auth_token
keystone_authtoken/keyfile auth_token
keystone_authtoken/memcache_secret_key auth_token
keystone_authtoken/memcache_security_strategy auth_token
-keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/memcached_servers common
keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token
matchmaker_redis/host redis
matchmaker_redis/password redis
matchmaker_redis/port redis
-matchmaker_ring/ringfile matchmaker
-paste_deploy/config_file paste
-paste_deploy/flavor paste
+matchmaker_ring/ringfile redis
+paste_deploy/config_file api
+paste_deploy/flavor api
profiler/enabled profiler
profiler/trace_sqlalchemy profiler
store_type_location_strategy/store_type_preference api
diff --git a/tools/autogenerate-config-flagmappings/glance.headers b/tools/autogenerate-config-flagmappings/glance.headers
index 761d4e927d..36151f573c 100644
--- a/tools/autogenerate-config-flagmappings/glance.headers
+++ b/tools/autogenerate-config-flagmappings/glance.headers
@@ -2,7 +2,6 @@ filesystem filesystem
gridfs GridFS
imagecache flagmappings
matchmaker matchmaker
-paste paste
profiler profiler
rbd RBD
registry registry
diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings
index 005ff405d9..6c9e7b42b0 100644
--- a/tools/autogenerate-config-flagmappings/heat.flagmappings
+++ b/tools/autogenerate-config-flagmappings/heat.flagmappings
@@ -5,7 +5,7 @@ auth_encryption_key crypt
backdoor_port debug
cloud_backend clients_backends
control_exchange amqp
-debug debug
+debug logging
default_log_levels logging
default_notification_level amqp
default_publisher_id amqp
@@ -15,7 +15,7 @@ enable_cloud_watch_lite cloudwatch_api
engine_life_check_timeout rpc
environment_dir common
event_purge_batch_size common
-fake_rabbit amqp
+fake_rabbit testing
fatal_deprecations logging
heat_metadata_server_url api metadata_api
heat_stack_user_role api
@@ -54,7 +54,7 @@ max_nested_stack_depth quota
max_resources_per_stack quota
max_stacks_per_tenant quota
max_template_size quota
-memcached_servers auth_token
+memcached_servers common
notification_driver amqp
notification_topics amqp
num_engine_workers api
@@ -63,7 +63,7 @@ periodic_interval common
plugin_dirs common
policy_default_rule api
policy_file api
-publish_errors notification
+publish_errors logging
qpid_heartbeat qpid
qpid_hostname qpid
qpid_hosts qpid
@@ -107,7 +107,7 @@ stack_domain_admin_password api
stack_user_domain_id api
stack_user_domain_name api
syslog_log_facility logging
-transport_url rpc
+transport_url amqp
trusts_delegated_roles api
use_stderr logging
use_syslog logging
@@ -237,14 +237,14 @@ keystone_authtoken/insecure auth_token
keystone_authtoken/keyfile auth_token
keystone_authtoken/memcache_secret_key auth_token
keystone_authtoken/memcache_security_strategy auth_token
-keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/memcached_servers common
keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token
matchmaker_redis/host redis
matchmaker_redis/password redis
matchmaker_redis/port redis
-matchmaker_ring/ringfile rpc
+matchmaker_ring/ringfile redis
paste_deploy/api_paste_config api
paste_deploy/flavor api
revision/heat_revision common
diff --git a/tools/autogenerate-config-flagmappings/keystone.flagmappings b/tools/autogenerate-config-flagmappings/keystone.flagmappings
index 7a35b38761..f7fd476ba8 100644
--- a/tools/autogenerate-config-flagmappings/keystone.flagmappings
+++ b/tools/autogenerate-config-flagmappings/keystone.flagmappings
@@ -9,12 +9,12 @@ backdoor_port debug
compute_port api
control_exchange amqp
crypt_strength security
-debug debug
+debug logging
default_log_levels logging
default_publisher_id amqp
domain_id_immutable api
-fake_rabbit rabbitmq
-fatal_deprecations debug
+fake_rabbit testing
+fatal_deprecations logging
instance_format logging
instance_uuid_format logging
kombu_reconnect_delay rabbitmq
@@ -32,14 +32,14 @@ logging_context_format_string logging
logging_debug_format_suffix logging
logging_default_format_string logging
logging_exception_prefix logging
-matchmaker_heartbeat_freq redis
-matchmaker_heartbeat_ttl redis
+matchmaker_heartbeat_freq rpc
+matchmaker_heartbeat_ttl rpc
max_param_size api
max_request_body_size api
max_token_size api
member_role_id api
member_role_name api
-memcached_servers auth_token
+memcached_servers common
notification_driver amqp
notification_topics amqp
policy_default_rule policy
@@ -48,7 +48,7 @@ public_bind_host api
public_endpoint api
public_port api
public_workers api
-publish_errors debug
+publish_errors logging
pydev_debug_host debug
pydev_debug_port debug
qpid_heartbeat qpid
@@ -74,11 +74,11 @@ rabbit_retry_interval rabbitmq
rabbit_use_ssl rabbitmq
rabbit_userid rabbitmq
rabbit_virtual_host rabbitmq
-rpc_backend amqp
-rpc_cast_timeout amqp
-rpc_conn_pool_size amqp
-rpc_response_timeout amqp
-rpc_thread_pool_size amqp
+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
rpc_zmq_contexts zeromq
rpc_zmq_host zeromq
@@ -185,7 +185,7 @@ keystone_authtoken/insecure auth_token
keystone_authtoken/keyfile auth_token
keystone_authtoken/memcache_secret_key auth_token
keystone_authtoken/memcache_security_strategy auth_token
-keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/memcached_servers common
keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index 4b8c2bd13a..3874ba7cd4 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -8,8 +8,8 @@ allow_bulk api
allow_overlapping_ips policy
allow_pagination api
allow_sorting api
-amqp_auto_delete rpc
-amqp_durable_queues rpc
+amqp_auto_delete amqp
+amqp_durable_queues amqp
api_extensions_path api
api_paste_config api
api_workers common
@@ -19,8 +19,8 @@ auth_insecure common
auth_region common
auth_strategy common
auth_url common
-backdoor_port testing
-backlog wsgi
+backdoor_port debug
+backlog api
base_mac common
bind_host common
bind_port common
@@ -28,7 +28,7 @@ ca_certs common
check_child_processes common
check_child_processes_action common
check_child_processes_interval common
-control_exchange rpc
+control_exchange amqp
core_plugin common
ctl_cert common
ctl_privkey common
@@ -47,7 +47,7 @@ dhcp_delete_namespaces common
dhcp_domain common
dhcp_driver common
dhcp_lease_duration common
-disable_process_locking common
+disable_process_locking debug
dnsmasq_config_file dhcp_agent
dnsmasq_dns_servers dhcp_agent
dnsmasq_lease_max dhcp_agent
@@ -104,7 +104,7 @@ max_request_body_size api
max_routes quotas
max_subnet_host_routes common
measure_interval metering_agent
-memcached_servers auth_token
+memcached_servers common
meta_flavor_driver_mappings metadata
metadata_backlog metadata
metadata_port metadata
@@ -115,8 +115,8 @@ min_l3_agents_per_router l3_agent
network_auto_schedule scheduler
network_device_mtu agent
network_scheduler_driver scheduler
-notification_driver notifier
-notification_topics notifier
+notification_driver amqp
+notification_topics amqp
notify_nova_on_port_data_changes compute
notify_nova_on_port_status_changes compute
nova_admin_auth_url compute
@@ -176,7 +176,7 @@ redirects vmware
report_interval common
resync_interval dhcp_agent
retries vmware
-retry_until_window wsgi
+retry_until_window api
root_helper common
router_auto_schedule scheduler
router_delete_namespaces scheduler
@@ -205,8 +205,8 @@ ssl_cert_file ca
ssl_key_file ca
state_path common
syslog_log_facility logging
-tcp_keepidle wsgi
-transport_url rpc
+tcp_keepidle api
+transport_url amqp
use_namespaces dhcp_agent
use_ssl logging
use_stderr logging
@@ -543,7 +543,7 @@ keystone_authtoken/insecure auth_token
keystone_authtoken/keyfile auth_token
keystone_authtoken/memcache_secret_key auth_token
keystone_authtoken/memcache_security_strategy auth_token
-keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/memcached_servers common
keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token
@@ -558,7 +558,7 @@ l3_arista/use_vrf l3_arista
matchmaker_redis/host redis
matchmaker_redis/password redis
matchmaker_redis/port redis
-matchmaker_ring/ringfile rpc
+matchmaker_ring/ringfile redis
ml2/extension_drivers ml2
ml2/mechanism_drivers ml2
ml2/tenant_network_types ml2
diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers
index b7f238e182..3ea54cb989 100644
--- a/tools/autogenerate-config-flagmappings/neutron.headers
+++ b/tools/autogenerate-config-flagmappings/neutron.headers
@@ -38,7 +38,6 @@ ml2_vlan ML2 VLAN
ml2_vxlan ML2 VXLN
mlnx Mellanox
nec Nec
-notifier notifier
nuage Nuage
nvsd NVSD driver
opencontrail OpenContrail
diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings
index d20e1fc2a9..9f7cf6c0bc 100644
--- a/tools/autogenerate-config-flagmappings/nova.flagmappings
+++ b/tools/autogenerate-config-flagmappings/nova.flagmappings
@@ -4,13 +4,13 @@ allow_instance_snapshots policy
allow_migrate_to_same_host policy
allow_resize_to_same_host policy
allow_same_net_traffic network
-amqp_auto_delete rpc rpc_all
-amqp_durable_queues rpc rpc_all
-api_paste_config wsgi
+amqp_auto_delete amqp
+amqp_durable_queues amqp
+api_paste_config api
api_rate_limit api
auth_strategy authentication
auto_assign_floating_ip network
-backdoor_port testing
+backdoor_port debug
bandwidth_poll_interval quota
baremetal_scheduler_default_filters scheduler
bindir common
@@ -48,7 +48,7 @@ console_xvp_multiplex_port xen
console_xvp_pid xen
consoleauth_manager console
consoleauth_topic common
-control_exchange rpc rpc_all
+control_exchange amqp
cpu_allocation_ratio scheduler
create_unique_mac_address_attempts network
crl_file ca
@@ -61,14 +61,14 @@ default_flavor compute
default_floating_pool network
default_log_levels logging
default_notification_level compute
-default_publisher_id compute
+default_publisher_id amqp
default_schedule_zone availabilityzones
defer_iptables_apply network
dhcp_domain network
dhcp_lease_time network
dhcpbridge network
dhcpbridge_flagfile network
-disable_process_locking common
+disable_process_locking debug
disk_allocation_ratio scheduler
dmz_cidr vpn
dmz_mask vpn
@@ -139,11 +139,11 @@ isolated_images scheduler
key_file ca
keys_path ca
keystone_ec2_url ec2
-kombu_reconnect_delay kombu rpc_all
-kombu_ssl_ca_certs kombu rpc_all
-kombu_ssl_certfile kombu rpc_all
-kombu_ssl_keyfile kombu rpc_all
-kombu_ssl_version kombu rpc_all
+kombu_reconnect_delay rabbitmq
+kombu_ssl_ca_certs rabbitmq
+kombu_ssl_certfile rabbitmq
+kombu_ssl_keyfile rabbitmq
+kombu_ssl_version rabbitmq
l3_lib network
ldap_dns_base_dn ldap
ldap_dns_password ldap
@@ -171,8 +171,8 @@ logging_context_format_string logging
logging_debug_format_suffix logging
logging_default_format_string logging
logging_exception_prefix logging
-matchmaker_heartbeat_freq rpc rpc_all
-matchmaker_heartbeat_ttl rpc rpc_all
+matchmaker_heartbeat_freq rpc
+matchmaker_heartbeat_ttl rpc
max_age policy
max_header_line api
max_instances_per_host scheduler
@@ -203,8 +203,8 @@ network_topic network
networks_path network
neutron_default_tenant_id neutron
non_inheritable_image_properties api
-notification_driver common
-notification_topics common
+notification_driver amqp
+notification_topics amqp
notify_api_faults common
notify_on_state_change common
novncproxy_base_url vnc
@@ -234,17 +234,17 @@ project_cert_subject ca
public_interface network
publish_errors logging
pybasedir common
-qpid_heartbeat qpid rpc_all
-qpid_hostname qpid rpc_all
-qpid_hosts qpid rpc_all
-qpid_password qpid rpc_all
-qpid_port qpid rpc_all
-qpid_protocol qpid rpc_all
-qpid_receiver_capacity qpid rpc_all
-qpid_sasl_mechanisms qpid rpc_all
-qpid_tcp_nodelay qpid rpc_all
-qpid_topology_version qpid rpc_all
-qpid_username qpid rpc_all
+qpid_heartbeat qpid
+qpid_hostname qpid
+qpid_hosts qpid
+qpid_password qpid
+qpid_port qpid
+qpid_protocol qpid
+qpid_receiver_capacity qpid
+qpid_sasl_mechanisms qpid
+qpid_tcp_nodelay qpid
+qpid_topology_version qpid
+qpid_username qpid
quota_cores quota
quota_driver quota
quota_fixed_ips quota
@@ -260,18 +260,18 @@ quota_security_group_rules quota
quota_security_groups quota
quota_server_group_members quota
quota_server_groups quota
-rabbit_ha_queues rabbitmq rpc_all
-rabbit_host rabbitmq rpc_all
-rabbit_hosts rabbitmq rpc_all
-rabbit_login_method rabbitmq rpc_all
-rabbit_max_retries rabbitmq rpc_all
-rabbit_password rabbitmq rpc_all
-rabbit_port rabbitmq rpc_all
-rabbit_retry_backoff rabbitmq rpc_all
-rabbit_retry_interval rabbitmq rpc_all
-rabbit_use_ssl rabbitmq rpc_all
-rabbit_userid rabbitmq rpc_all
-rabbit_virtual_host rabbitmq rpc_all
+rabbit_ha_queues rabbitmq
+rabbit_host rabbitmq
+rabbit_hosts rabbitmq
+rabbit_login_method rabbitmq
+rabbit_max_retries rabbitmq
+rabbit_password rabbitmq
+rabbit_port rabbitmq
+rabbit_retry_backoff rabbitmq
+rabbit_retry_interval rabbitmq
+rabbit_use_ssl rabbitmq
+rabbit_userid rabbitmq
+rabbit_virtual_host rabbitmq
ram_allocation_ratio scheduler
ram_weight_multiplier scheduler
reboot_timeout compute
@@ -290,18 +290,18 @@ restrict_isolated_hosts_to_isolated_images scheduler
resume_guests_state_on_host_boot compute
rootwrap_config common
routing_source_ip network
-rpc_backend rpc rpc_all
-rpc_cast_timeout rpc rpc_all
-rpc_conn_pool_size rpc rpc_all
-rpc_response_timeout rpc rpc_all
-rpc_thread_pool_size rpc rpc_all
-rpc_zmq_bind_address zeromq rpc_all
-rpc_zmq_contexts zeromq rpc_all
-rpc_zmq_host zeromq rpc_all
-rpc_zmq_ipc_dir zeromq rpc_all
-rpc_zmq_matchmaker zeromq rpc_all
-rpc_zmq_port zeromq rpc_all
-rpc_zmq_topic_backlog zeromq rpc_all
+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
+rpc_zmq_contexts zeromq
+rpc_zmq_host zeromq
+rpc_zmq_ipc_dir zeromq
+rpc_zmq_matchmaker zeromq
+rpc_zmq_port zeromq
+rpc_zmq_topic_backlog zeromq
run_external_periodic_tasks periodic
running_deleted_instance_action compute
running_deleted_instance_poll_interval compute
@@ -336,18 +336,18 @@ shelved_offload_time compute
shelved_poll_interval compute
shutdown_timeout compute
snapshot_name_template api
-ssl_ca_file wsgi
-ssl_cert_file wsgi
-ssl_key_file wsgi
+ssl_ca_file ca
+ssl_cert_file ca
+ssl_key_file ca
state_path common
stub_compute xen
sync_power_state_interval compute
syslog_log_facility logging
-tcp_keepidle wsgi
+tcp_keepidle api
teardown_unused_network_gateway network
tempdir common
timeout_nbd hypervisor
-transport_url common
+transport_url amqp
until_refresh policy
update_dns_entries network
use_cow_images hypervisor
@@ -381,8 +381,8 @@ vpn_image_id vpn
vpn_ip vpn
vpn_key_suffix vpn
vpn_start vpn
-wsgi_default_pool_size wsgi
-wsgi_log_format wsgi
+wsgi_default_pool_size api
+wsgi_log_format api
xvpvncproxy_base_url xvpnvncproxy
xvpvncproxy_host xvpnvncproxy
xvpvncproxy_port xvpnvncproxy
@@ -440,7 +440,7 @@ cells/name cells
cells/offset_weight_multiplier cells
cells/ram_weight_multiplier scheduler
cells/reserve_percent cells
-cells/rpc_driver_queue_base rpc rpc_all
+cells/rpc_driver_queue_base rpc
cells/scheduler upgrade_levels
cells/scheduler_filter_classes scheduler
cells/scheduler_retries scheduler
@@ -543,7 +543,7 @@ keystone_authtoken/insecure auth_token
keystone_authtoken/keyfile auth_token
keystone_authtoken/memcache_secret_key auth_token
keystone_authtoken/memcache_security_strategy auth_token
-keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/memcached_servers common
keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token
@@ -606,7 +606,7 @@ libvirt/xen_hvmloader_path xen
matchmaker_redis/host redis
matchmaker_redis/password redis
matchmaker_redis/port redis
-matchmaker_ring/ringfile rpc rpc_all
+matchmaker_ring/ringfile redis
metrics/required scheduler
metrics/weight_multiplier scheduler
metrics/weight_of_unavailable scheduler
@@ -653,7 +653,7 @@ trusted_computing/attestation_auth_timeout trustedcomputing
trusted_computing/attestation_port trustedcomputing
trusted_computing/attestation_server trustedcomputing
trusted_computing/attestation_server_ca_file trustedcomputing
-upgrade_levels/baseapi rpc rpc_all
+upgrade_levels/baseapi rpc
upgrade_levels/cells upgrade_levels
upgrade_levels/cert upgrade_levels
upgrade_levels/compute upgrade_levels
diff --git a/tools/autogenerate-config-flagmappings/nova.headers b/tools/autogenerate-config-flagmappings/nova.headers
index fb5986c6b0..7c6f631a94 100644
--- a/tools/autogenerate-config-flagmappings/nova.headers
+++ b/tools/autogenerate-config-flagmappings/nova.headers
@@ -15,7 +15,6 @@ hypervisor hypervisor
ironic bare metal
ipv6 IPv6
keymgr key manager
-kombu kombu
ldap LDAP
libvirt Libvirt
livemigration live migration
diff --git a/tools/autogenerate-config-flagmappings/sahara.flagmappings b/tools/autogenerate-config-flagmappings/sahara.flagmappings
index 588a408f89..bc5a441e31 100644
--- a/tools/autogenerate-config-flagmappings/sahara.flagmappings
+++ b/tools/autogenerate-config-flagmappings/sahara.flagmappings
@@ -2,16 +2,16 @@ amqp_auto_delete amqp
amqp_durable_queues amqp
cluster_remote_threshold common
compute_topology_file common
-control_exchange common
+control_exchange amqp
db_driver database
-debug debug
+debug logging
default_log_levels logging
detach_volume_timeout common
disable_process_locking debug
enable_data_locality common
enable_hypervisor_awareness common
enable_notifications common
-fake_rabbit debug
+fake_rabbit testing
fatal_deprecations logging
global_remote_threshold common
host common
@@ -20,11 +20,11 @@ instance_format logging
instance_uuid_format logging
job_binary_max_KB common
job_workflow_postfix common
-kombu_reconnect_delay rpc
-kombu_ssl_ca_certs rpc
-kombu_ssl_certfile rpc
-kombu_ssl_keyfile rpc
-kombu_ssl_version rpc
+kombu_reconnect_delay rabbitmq
+kombu_ssl_ca_certs rabbitmq
+kombu_ssl_certfile rabbitmq
+kombu_ssl_keyfile rabbitmq
+kombu_ssl_version rabbitmq
lock_path common
log_config_append logging
log_date_format logging
@@ -93,7 +93,7 @@ rpc_zmq_topic_backlog zeromq
run_external_periodic_tasks common
swift_topology_file common
syslog_log_facility logging
-transport_url common
+transport_url amqp
use_domain_for_proxy_users domain
use_floating_ips common
use_identity_api_v3 common
@@ -149,7 +149,7 @@ keystone_authtoken/insecure auth_token
keystone_authtoken/keyfile auth_token
keystone_authtoken/memcache_secret_key auth_token
keystone_authtoken/memcache_security_strategy auth_token
-keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/memcached_servers common
keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token
diff --git a/tools/autogenerate-config-flagmappings/shared.headers b/tools/autogenerate-config-flagmappings/shared.headers
index 883ae95689..00095ca607 100644
--- a/tools/autogenerate-config-flagmappings/shared.headers
+++ b/tools/autogenerate-config-flagmappings/shared.headers
@@ -8,7 +8,7 @@ clients clients
common common
compute Compute
database database
-debug debug
+debug logging
glance glance
logging logging
metadata metadata
diff --git a/tools/autogenerate-config-flagmappings/trove.flagmappings b/tools/autogenerate-config-flagmappings/trove.flagmappings
index 043045bafe..5ea8b67625 100644
--- a/tools/autogenerate-config-flagmappings/trove.flagmappings
+++ b/tools/autogenerate-config-flagmappings/trove.flagmappings
@@ -37,13 +37,13 @@ databases_page_size common
datastore_manager taskmanager
datastore_registry_ext taskmanager
db_api_implementation api
-debug debug
+debug logging
default_datastore common
default_log_levels logging
default_neutron_networks common
default_notification_level common
default_password_length common
-default_publisher_id common
+default_publisher_id amqp
device_path volume
disable_process_locking debug
dns_account_id dns
@@ -64,7 +64,7 @@ dns_username dns
exists_notification_ticks taskmanager
exists_notification_transformer taskmanager
expected_filetype_suffixes common
-fake_rabbit amqp
+fake_rabbit testing
fatal_deprecations logging
format_options logging
guest_config guestagent
@@ -85,10 +85,10 @@ instance_format logging
instance_uuid_format logging
instances_page_size api
ip_regex compute
-kombu_ssl_ca_certs amqp
-kombu_ssl_certfile amqp
-kombu_ssl_keyfile amqp
-kombu_ssl_version amqp
+kombu_ssl_ca_certs rabbitmq
+kombu_ssl_certfile rabbitmq
+kombu_ssl_keyfile rabbitmq
+kombu_ssl_version rabbitmq
lock_path common
log_config_append logging
log_date_format logging
@@ -106,7 +106,7 @@ max_backups_per_user quota
max_header_line api
max_instances_per_user quota
max_volumes_per_user quota
-memcached_servers auth_token
+memcached_servers common
mount_options guestagent
network_driver network
network_label_regex logging
@@ -258,7 +258,7 @@ keystone_authtoken/insecure auth_token
keystone_authtoken/keyfile auth_token
keystone_authtoken/memcache_secret_key auth_token
keystone_authtoken/memcache_security_strategy auth_token
-keystone_authtoken/memcached_servers auth_token
+keystone_authtoken/memcached_servers common
keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token