From 9351e7c29319c22cb1957177de5dab4f73e7d1c3 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Sat, 23 Apr 2016 23:40:25 +0800 Subject: [PATCH] Update Config Reference for Ceilometer * Enhancing Retry logic to Coordination when joining partitioning grp https://review.openstack.org/#/c/294244/ * drop magnetodb support: https://review.openstack.org/301245 * Remove the deprecated DB2 driver: https://review.openstack.org/302265 Change-Id: I786366131d7700c670bcc63cba0b06a0f39e2dbf Closes-Bug: #1567146 --- doc/config-reference/source/tables/ceilometer-common.rst | 4 ++++ doc/config-reference/source/tables/ceilometer-database.rst | 2 -- doc/config-reference/source/tables/ceilometer-dispatchers.rst | 2 +- .../autogenerate-config-flagmappings/ceilometer.flagmappings | 4 ++-- tools/autogenerate-config-flagmappings/ceilometer.headers | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/config-reference/source/tables/ceilometer-common.rst b/doc/config-reference/source/tables/ceilometer-common.rst index b02e08f03e..cb74cd60fd 100644 --- a/doc/config-reference/source/tables/ceilometer-common.rst +++ b/doc/config-reference/source/tables/ceilometer-common.rst @@ -52,6 +52,10 @@ - (Floating point) Number of seconds between checks to see if group membership has changed * - ``heartbeat`` = ``1.0`` - (Floating point) Number of seconds between heartbeats for distributed coordination. + * - ``max_retry_interval`` = ``30`` + - (Integer) Maximum number of seconds between retry to join partitioning group + * - ``retry_backoff`` = ``1`` + - (Integer) Retry backoff factor when retrying to connect withcoordination backend * - **[keystone_authtoken]** - * - ``memcached_servers`` = ``None`` diff --git a/doc/config-reference/source/tables/ceilometer-database.rst b/doc/config-reference/source/tables/ceilometer-database.rst index 96b910a7e4..a6b79e1834 100644 --- a/doc/config-reference/source/tables/ceilometer-database.rst +++ b/doc/config-reference/source/tables/ceilometer-database.rst @@ -30,8 +30,6 @@ - (Integer) Verbosity of SQL debugging information: 0=None, 100=Everything. * - ``connection_trace`` = ``False`` - (Boolean) Add Python stack traces to SQL as comment strings. - * - ``db2nosql_resource_id_maxlen`` = ``512`` - - (Integer) The max length of resources id in DB2 nosql, the value should be larger than len(hostname) * 2 as compute node's resource id is _. * - ``db_inc_retry_interval`` = ``True`` - (Boolean) If True, increases the interval between retries of a database operation up to db_max_retry_interval. * - ``db_max_retries`` = ``20`` diff --git a/doc/config-reference/source/tables/ceilometer-dispatchers.rst b/doc/config-reference/source/tables/ceilometer-dispatchers.rst index 83048f22ed..cd72397706 100644 --- a/doc/config-reference/source/tables/ceilometer-dispatchers.rst +++ b/doc/config-reference/source/tables/ceilometer-dispatchers.rst @@ -10,7 +10,7 @@ .. _ceilometer-dispatchers: -.. list-table:: Description of dispatchers configuration options +.. list-table:: Description of Dispatchers configuration options :header-rows: 1 :class: config-ref-table diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings index 7e8f1a81be..a9ff6aad41 100644 --- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings +++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings @@ -33,7 +33,6 @@ logging_debug_format_suffix logging logging_default_format_string logging logging_exception_prefix logging logging_user_identity_format logging -magnetodb_control_exchange magnetodb magnum_control_exchange exchange memcached_servers common meter_dispatchers dispatchers @@ -100,6 +99,8 @@ compute/workload_partitioning common coordination/backend_url common coordination/check_watchers common coordination/heartbeat common +coordination/max_retry_interval common +coordination/retry_backoff common cors/allow_credentials cors cors/allow_headers cors cors/allow_methods cors @@ -116,7 +117,6 @@ database/backend database database/connection database database/connection_debug database database/connection_trace database -database/db2nosql_resource_id_maxlen database database/db_inc_retry_interval database database/db_max_retries database database/db_max_retry_interval database diff --git a/tools/autogenerate-config-flagmappings/ceilometer.headers b/tools/autogenerate-config-flagmappings/ceilometer.headers index 5996eba836..351a6504ac 100644 --- a/tools/autogenerate-config-flagmappings/ceilometer.headers +++ b/tools/autogenerate-config-flagmappings/ceilometer.headers @@ -1,6 +1,7 @@ collector collector dispatcher_http HTTP dispatcher dispatcher_gnocchi Gnocchi dispatcher +dispatchers Dispatchers events events exchange exchange hyperv HyperV