From 9f2abcfa16d50932f4fc032f2efdc6302c4ff048 Mon Sep 17 00:00:00 2001 From: Qiaowei Ren Date: Tue, 16 Feb 2016 20:50:03 +0800 Subject: [PATCH] remove default=None for config options In the cfg module default=None is set as the default value. Change-Id: I1cacfb21da3f0b8510d76767f9de2f81a8a88063 --- ceilometer/agent/manager.py | 1 - ceilometer/coordination.py | 1 - ceilometer/dispatcher/gnocchi.py | 1 - ceilometer/storage/__init__.py | 2 -- 4 files changed, 5 deletions(-) diff --git a/ceilometer/agent/manager.py b/ceilometer/agent/manager.py index 3b2499cb..779c1a3b 100644 --- a/ceilometer/agent/manager.py +++ b/ceilometer/agent/manager.py @@ -59,7 +59,6 @@ OPTS = [ POLLING_OPTS = [ cfg.StrOpt('partitioning_group_prefix', - default=None, deprecated_group='central', help='Work-load partitioning group prefix. Use only if you ' 'want to run multiple polling agents with different ' diff --git a/ceilometer/coordination.py b/ceilometer/coordination.py index e4b173f8..c98b5ee2 100644 --- a/ceilometer/coordination.py +++ b/ceilometer/coordination.py @@ -27,7 +27,6 @@ LOG = log.getLogger(__name__) OPTS = [ cfg.StrOpt('backend_url', - default=None, help='The backend URL to use for distributed coordination. If ' 'left empty, per-deployment central agent and per-host ' 'compute agent won\'t do workload ' diff --git a/ceilometer/dispatcher/gnocchi.py b/ceilometer/dispatcher/gnocchi.py index 942b4807..51617040 100644 --- a/ceilometer/dispatcher/gnocchi.py +++ b/ceilometer/dispatcher/gnocchi.py @@ -52,7 +52,6 @@ dispatcher_opts = [ deprecated_for_removal=True, help='URL to Gnocchi. default: autodetection'), cfg.StrOpt('archive_policy', - default=None, help='The archive policy to use when the dispatcher ' 'create a new metric.'), cfg.StrOpt('resources_definition_file', diff --git a/ceilometer/storage/__init__.py b/ceilometer/storage/__init__.py index 7f49ce07..8ff68da4 100644 --- a/ceilometer/storage/__init__.py +++ b/ceilometer/storage/__init__.py @@ -51,12 +51,10 @@ OPTS = [ "in the database for (<= 0 means forever).")), cfg.StrOpt('metering_connection', secret=True, - default=None, help='The connection string used to connect to the metering ' 'database. (if unset, connection is used)'), cfg.StrOpt('event_connection', secret=True, - default=None, help='The connection string used to connect to the event ' 'database. (if unset, connection is used)'), cfg.IntOpt('db2nosql_resource_id_maxlen',