From 5977dbf006f7cccc64fe2fc3244ea11aa3a8f391 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Wed, 26 Mar 2014 20:20:59 +0100 Subject: [PATCH] Update flags and tables Update autogenerated data for ceilometer, cinder, heat and nova. Also fix a set of values previously generated from my own machine settings. Change-Id: I5591e42eba2a7efd5e6360ee1162bbd8fae83660 --- doc/common/tables/ceilometer-auth.xml | 12 ++++-------- doc/common/tables/ceilometer-collector.xml | 7 +++++++ doc/common/tables/ceilometer-common.xml | 4 ++++ doc/common/tables/ceilometer-qpid.xml | 2 +- doc/common/tables/ceilometer-rabbitmq.xml | 2 +- doc/common/tables/cinder-rpc.xml | 4 ++-- doc/common/tables/cinder-vmware.xml | 4 ---- doc/common/tables/cinder-xiv.xml | 4 ++++ doc/common/tables/glance-qpid.xml | 2 +- doc/common/tables/glance-rabbitmq.xml | 2 +- doc/common/tables/heat-common.xml | 2 +- doc/common/tables/heat-qpid.xml | 2 +- doc/common/tables/heat-rabbitmq.xml | 2 +- doc/common/tables/neutron-bigswitch.xml | 2 +- doc/common/tables/neutron-ml2_bigswitch.xml | 2 +- doc/common/tables/neutron-qpid.xml | 2 +- doc/common/tables/neutron-rabbitmq.xml | 2 +- doc/common/tables/nova-logging.xml | 2 +- doc/common/tables/nova-neutron.xml | 2 +- doc/common/tables/nova-qpid.xml | 2 +- doc/common/tables/nova-rabbitmq.xml | 2 +- doc/common/tables/nova-redis.xml | 11 ----------- doc/common/tables/nova-rpc_all.xml | 4 ++-- doc/common/tables/trove-qpid.xml | 2 +- doc/common/tables/trove-rabbitmq.xml | 2 +- .../ceilometer.flagmappings | 3 ++- .../cinder.flagmappings | 2 +- .../nova.flagmappings | 2 -- 28 files changed, 43 insertions(+), 48 deletions(-) diff --git a/doc/common/tables/ceilometer-auth.xml b/doc/common/tables/ceilometer-auth.xml index 26d2b32459..228c8a1e7a 100644 --- a/doc/common/tables/ceilometer-auth.xml +++ b/doc/common/tables/ceilometer-auth.xml @@ -89,10 +89,6 @@ http_connect_timeout = None (BoolOpt) Request timeout value for communicating with Identity API server. - - http_handler = None - (StrOpt) Allows to pass in the name of a fake http_handler callback function used instead of httplib.HTTPConnection or httplib.HTTPSConnection. Useful for unit testing where network is not available. - http_request_max_retries = 3 (IntOpt) How many times are we trying to reconnect when communicating with Identity API Server. @@ -119,11 +115,11 @@ memcached_servers = None - (ListOpt) If defined, the memcache server(s) to use for caching + (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 = 1 - (IntOpt) Value only used for unit testing + revocation_cache_time = 300 + (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. signing_dir = None @@ -131,7 +127,7 @@ token_cache_time = 300 - (IntOpt) In order to prevent excessive requests and validations, the middleware uses an in-memory cache for the tokens the Keystone API returns. This is only valid if memcache_servers is defined. Set to -1 to disable caching completely. + (IntOpt) In order to prevent excessive effort spent validating tokens, the middleware caches previously-seen tokens for a configurable duration (in seconds). Set to -1 to disable caching completely. [service_credentials] diff --git a/doc/common/tables/ceilometer-collector.xml b/doc/common/tables/ceilometer-collector.xml index b56df8ba8e..2cc654d757 100644 --- a/doc/common/tables/ceilometer-collector.xml +++ b/doc/common/tables/ceilometer-collector.xml @@ -15,6 +15,13 @@ + + [DEFAULT] + + + collector_workers = 1 + (IntOpt) Number of workers for collector service. A single collector is enabled by default. + [collector] diff --git a/doc/common/tables/ceilometer-common.xml b/doc/common/tables/ceilometer-common.xml index 7f9c0c426d..ffb546a726 100644 --- a/doc/common/tables/ceilometer-common.xml +++ b/doc/common/tables/ceilometer-common.xml @@ -38,6 +38,10 @@ memcached_servers = None (ListOpt) Memcached servers or None for in process cache. + + notification_workers = 1 + (IntOpt) Number of workers for notification service. A single notification agent is enabled by default. + diff --git a/doc/common/tables/ceilometer-qpid.xml b/doc/common/tables/ceilometer-qpid.xml index 4c980944e3..18f55b7d68 100644 --- a/doc/common/tables/ceilometer-qpid.xml +++ b/doc/common/tables/ceilometer-qpid.xml @@ -23,7 +23,7 @@ (IntOpt) Seconds between connection keepalive heartbeats - qpid_hostname = oslo + qpid_hostname = localhost (StrOpt) Qpid broker hostname diff --git a/doc/common/tables/ceilometer-rabbitmq.xml b/doc/common/tables/ceilometer-rabbitmq.xml index 789cb3cb5a..f870b3f819 100644 --- a/doc/common/tables/ceilometer-rabbitmq.xml +++ b/doc/common/tables/ceilometer-rabbitmq.xml @@ -43,7 +43,7 @@ (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. - rabbit_host = oslo + rabbit_host = localhost (StrOpt) The RabbitMQ broker address where a single node is used diff --git a/doc/common/tables/cinder-rpc.xml b/doc/common/tables/cinder-rpc.xml index ee03769067..6d371933f7 100644 --- a/doc/common/tables/cinder-rpc.xml +++ b/doc/common/tables/cinder-rpc.xml @@ -95,7 +95,7 @@ (IntOpt) Seconds between connection keepalive heartbeats. - qpid_hostname = oslo + qpid_hostname = localhost (StrOpt) Qpid broker hostname. @@ -135,7 +135,7 @@ (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. - rabbit_host = oslo + rabbit_host = localhost (StrOpt) The RabbitMQ broker address where a single node is used. diff --git a/doc/common/tables/cinder-vmware.xml b/doc/common/tables/cinder-vmware.xml index 3ea9a0930b..87b4657fc7 100644 --- a/doc/common/tables/cinder-vmware.xml +++ b/doc/common/tables/cinder-vmware.xml @@ -18,10 +18,6 @@ [DEFAULT] - - pbm_default_policy = None - (StrOpt) The PBM default policy. If using VC server version 5.5 or above and there is no defined storage policy for the specific request then this policy will be used. - vmware_api_retry_count = 10 (IntOpt) Number of times VMware ESX/VC server API must be retried upon connection related issues. diff --git a/doc/common/tables/cinder-xiv.xml b/doc/common/tables/cinder-xiv.xml index 313b4f16a2..eaaaee380f 100644 --- a/doc/common/tables/cinder-xiv.xml +++ b/doc/common/tables/cinder-xiv.xml @@ -18,6 +18,10 @@ [DEFAULT] + + xiv_chap = disabled + (StrOpt) CHAP authentication mode, effective only for iscsi (disabled|enabled) + xiv_ds8k_connection_type = iscsi (StrOpt) Connection type to the IBM Storage Array (fibre_channel|iscsi) diff --git a/doc/common/tables/glance-qpid.xml b/doc/common/tables/glance-qpid.xml index a146f08f85..0408bb59d5 100644 --- a/doc/common/tables/glance-qpid.xml +++ b/doc/common/tables/glance-qpid.xml @@ -23,7 +23,7 @@ (IntOpt) Seconds between connection keepalive heartbeats. - qpid_hostname = oslo + qpid_hostname = localhost (StrOpt) Qpid broker hostname. diff --git a/doc/common/tables/glance-rabbitmq.xml b/doc/common/tables/glance-rabbitmq.xml index 1c62413284..cf47e1856a 100644 --- a/doc/common/tables/glance-rabbitmq.xml +++ b/doc/common/tables/glance-rabbitmq.xml @@ -51,7 +51,7 @@ (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. - rabbit_host = oslo + rabbit_host = localhost (StrOpt) The RabbitMQ broker address where a single node is used. diff --git a/doc/common/tables/heat-common.xml b/doc/common/tables/heat-common.xml index 00f7dec9c2..8c140dea2e 100644 --- a/doc/common/tables/heat-common.xml +++ b/doc/common/tables/heat-common.xml @@ -36,7 +36,7 @@ instance_user = ec2-user - (StrOpt) The default user for new instances. + (StrOpt) The default user for new instances. This option is deprecated and will be removed in the Juno release. If it's empty, Heat will use the default user set up with your cloud image (for OS::Nova::Server) or 'ec2-user' (for AWS::EC2::Instance). keystone_backend = heat.common.heat_keystoneclient.KeystoneClientV3 diff --git a/doc/common/tables/heat-qpid.xml b/doc/common/tables/heat-qpid.xml index 2a3ac5d27a..7656a6e4f8 100644 --- a/doc/common/tables/heat-qpid.xml +++ b/doc/common/tables/heat-qpid.xml @@ -23,7 +23,7 @@ (IntOpt) Seconds between connection keepalive heartbeats - qpid_hostname = oslo + qpid_hostname = localhost (StrOpt) Qpid broker hostname diff --git a/doc/common/tables/heat-rabbitmq.xml b/doc/common/tables/heat-rabbitmq.xml index dc66fef627..0d3b08f71d 100644 --- a/doc/common/tables/heat-rabbitmq.xml +++ b/doc/common/tables/heat-rabbitmq.xml @@ -39,7 +39,7 @@ (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to wipe RabbitMQ database when changing this option. - rabbit_host = oslo + rabbit_host = localhost (StrOpt) The RabbitMQ broker address where a single node is used diff --git a/doc/common/tables/neutron-bigswitch.xml b/doc/common/tables/neutron-bigswitch.xml index 022691ad3b..2f44b98393 100644 --- a/doc/common/tables/neutron-bigswitch.xml +++ b/doc/common/tables/neutron-bigswitch.xml @@ -94,7 +94,7 @@ (IntOpt) Time between verifications that the backend controller database is consistent with Neutron - neutron_id = neutron-ol + neutron_id = neutron-oslo (StrOpt) User defined identifier for this Neutron deployment diff --git a/doc/common/tables/neutron-ml2_bigswitch.xml b/doc/common/tables/neutron-ml2_bigswitch.xml index 0449fe9578..aa0550f077 100644 --- a/doc/common/tables/neutron-ml2_bigswitch.xml +++ b/doc/common/tables/neutron-ml2_bigswitch.xml @@ -94,7 +94,7 @@ (IntOpt) Time between verifications that the backend controller database is consistent with Neutron - neutron_id = neutron-ol + neutron_id = neutron-oslo (StrOpt) User defined identifier for this Neutron deployment diff --git a/doc/common/tables/neutron-qpid.xml b/doc/common/tables/neutron-qpid.xml index 06ad2dcdfe..aac6e35fc5 100644 --- a/doc/common/tables/neutron-qpid.xml +++ b/doc/common/tables/neutron-qpid.xml @@ -23,7 +23,7 @@ (IntOpt) Seconds between connection keepalive heartbeats - qpid_hostname = oslo + qpid_hostname = localhost (StrOpt) Qpid broker hostname diff --git a/doc/common/tables/neutron-rabbitmq.xml b/doc/common/tables/neutron-rabbitmq.xml index 7e3be7d7cf..a374b2ad60 100644 --- a/doc/common/tables/neutron-rabbitmq.xml +++ b/doc/common/tables/neutron-rabbitmq.xml @@ -23,7 +23,7 @@ (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to wipe RabbitMQ database when changing this option. - rabbit_host = oslo + rabbit_host = localhost (StrOpt) The RabbitMQ broker address where a single node is used diff --git a/doc/common/tables/nova-logging.xml b/doc/common/tables/nova-logging.xml index 0e15a09319..fab55834d9 100644 --- a/doc/common/tables/nova-logging.xml +++ b/doc/common/tables/nova-logging.xml @@ -23,7 +23,7 @@ (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, iso8601=WARN + default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN (ListOpt) list of logger=LEVEL pairs diff --git a/doc/common/tables/nova-neutron.xml b/doc/common/tables/nova-neutron.xml index 9edf44e436..3cb1ccdf35 100644 --- a/doc/common/tables/nova-neutron.xml +++ b/doc/common/tables/nova-neutron.xml @@ -32,7 +32,7 @@ neutron_admin_tenant_name = None - (StrOpt) DEPRECATED: Tenant name for connecting to neutron in admin context. This option is deprecated. Please use neutron_admin_tenant_id instead. Note that with Keystone V3 tenant names may not be unique. + (StrOpt) Tenant name for connecting to neutron in admin context. This option is mutually exclusive with neutron_admin_tenant_id. Note that with Keystone V3 tenant names are only unique within a domain. neutron_admin_username = None diff --git a/doc/common/tables/nova-qpid.xml b/doc/common/tables/nova-qpid.xml index bf60046ce6..d8390c16dd 100644 --- a/doc/common/tables/nova-qpid.xml +++ b/doc/common/tables/nova-qpid.xml @@ -23,7 +23,7 @@ (IntOpt) Seconds between connection keepalive heartbeats. - qpid_hostname = oslo + qpid_hostname = localhost (StrOpt) Qpid broker hostname. diff --git a/doc/common/tables/nova-rabbitmq.xml b/doc/common/tables/nova-rabbitmq.xml index 67c5ed8a9b..05e4a96203 100644 --- a/doc/common/tables/nova-rabbitmq.xml +++ b/doc/common/tables/nova-rabbitmq.xml @@ -23,7 +23,7 @@ (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. - rabbit_host = oslo + rabbit_host = localhost (StrOpt) The RabbitMQ broker address where a single node is used. diff --git a/doc/common/tables/nova-redis.xml b/doc/common/tables/nova-redis.xml index 83488d3a46..021ac3ab70 100644 --- a/doc/common/tables/nova-redis.xml +++ b/doc/common/tables/nova-redis.xml @@ -22,17 +22,6 @@ password = None (StrOpt) Password for Redis server (optional). - - [remote_debug] - - - host = None - (StrOpt) Debug host (IP or name) to connect. Note that using the remote debug option changes how Nova uses the eventlet library to support async IO. This could result in failures that do not occur under normal operation. Use at your own risk. - - - port = None - (IntOpt) Debug port to connect. Note that using the remote debug option changes how Nova uses the eventlet library to support async IO. This could result in failures that do not occur under normal operation. Use at your own risk. - diff --git a/doc/common/tables/nova-rpc_all.xml b/doc/common/tables/nova-rpc_all.xml index 71afcbc003..64d21a1ca5 100644 --- a/doc/common/tables/nova-rpc_all.xml +++ b/doc/common/tables/nova-rpc_all.xml @@ -63,7 +63,7 @@ (IntOpt) Seconds between connection keepalive heartbeats. - qpid_hostname = oslo + qpid_hostname = localhost (StrOpt) Qpid broker hostname. @@ -103,7 +103,7 @@ (BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database. - rabbit_host = oslo + rabbit_host = localhost (StrOpt) The RabbitMQ broker address where a single node is used. diff --git a/doc/common/tables/trove-qpid.xml b/doc/common/tables/trove-qpid.xml index 1d2d73640c..b1848b766a 100644 --- a/doc/common/tables/trove-qpid.xml +++ b/doc/common/tables/trove-qpid.xml @@ -23,7 +23,7 @@ (IntOpt) Seconds between connection keepalive heartbeats - qpid_hostname = oslo + qpid_hostname = localhost (StrOpt) Qpid broker hostname diff --git a/doc/common/tables/trove-rabbitmq.xml b/doc/common/tables/trove-rabbitmq.xml index 2b0101a27c..747fb41461 100644 --- a/doc/common/tables/trove-rabbitmq.xml +++ b/doc/common/tables/trove-rabbitmq.xml @@ -23,7 +23,7 @@ (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to wipe RabbitMQ database when changing this option. - rabbit_host = oslo + rabbit_host = localhost (StrOpt) The RabbitMQ broker address where a single node is used diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings index b88734f5d8..bd36b47e5e 100644 --- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings +++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings @@ -4,6 +4,7 @@ amqp_durable_queues amqp auth_strategy auth backdoor_port common cinder_control_exchange exchange +collector_workers collector control_exchange exchange database_connection database debug logging @@ -46,6 +47,7 @@ mysql_engine database neutron_control_exchange exchange notification_driver amqp notification_topics amqp +notification_workers common nova_control_exchange exchange pipeline_cfg_file api policy_default_rule api @@ -153,7 +155,6 @@ keystone_authtoken/certfile auth keystone_authtoken/delay_auth_decision auth keystone_authtoken/enforce_token_bind auth keystone_authtoken/http_connect_timeout auth -keystone_authtoken/http_handler auth keystone_authtoken/http_request_max_retries auth keystone_authtoken/include_service_catalog auth keystone_authtoken/insecure auth diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 905c3ce841..57f001dd2d 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -215,7 +215,6 @@ osapi_volume_listen api osapi_volume_listen_port api osapi_volume_workers api password rpc -pbm_default_policy vmware periodic_fuzzy_delay common periodic_interval common policy_default_rule common @@ -371,6 +370,7 @@ xenapi_connection_username storage_xen xenapi_nfs_server storage_xen xenapi_nfs_serverpath storage_xen xenapi_sr_base_path storage_xen +xiv_chap xiv xiv_ds8k_connection_type xiv xiv_ds8k_proxy xiv zadara_password zadara diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings index e9142ffea6..70013154cd 100644 --- a/tools/autogenerate-config-flagmappings/nova.flagmappings +++ b/tools/autogenerate-config-flagmappings/nova.flagmappings @@ -573,8 +573,6 @@ osapi_v3/extensions_blacklist apiv3 osapi_v3/extensions_whitelist apiv3 rdp/enabled rdp rdp/html5_proxy_base_url rdp -remote_debug/host redis -remote_debug/port redis spice/agent_enabled spice spice/enabled spice spice/html5proxy_base_url spice