From d97eedd8ebf133ad95392e994d35bb55d6d237e8 Mon Sep 17 00:00:00 2001 From: lvdongbing Date: Wed, 11 Jun 2014 21:29:14 +0800 Subject: [PATCH] remove default=None for config options In the cfg module default=None is set as the default value. Change-Id: I65786401354e5fb966339cbdb4a76f5f628b8d6f Closes-Bug: #1323975 --- ceilometer/cli.py | 3 +-- ceilometer/dispatcher/file.py | 1 - ceilometer/storage/__init__.py | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ceilometer/cli.py b/ceilometer/cli.py index 4a4ae976c8..cb7948cfbc 100644 --- a/ceilometer/cli.py +++ b/ceilometer/cli.py @@ -135,8 +135,7 @@ def send_sample(): required=True), cfg.StrOpt('sample-unit', short='U', - help='Meter unit.', - default=None), + help='Meter unit.'), cfg.IntOpt('sample-volume', short='l', help='Meter volume value.', diff --git a/ceilometer/dispatcher/file.py b/ceilometer/dispatcher/file.py index 2dddf224aa..57b37e2e28 100644 --- a/ceilometer/dispatcher/file.py +++ b/ceilometer/dispatcher/file.py @@ -24,7 +24,6 @@ from ceilometer import dispatcher file_dispatcher_opts = [ cfg.StrOpt('file_path', - default=None, help='Name and the location of the file to record ' 'meters.'), cfg.IntOpt('max_bytes', diff --git a/ceilometer/storage/__init__.py b/ceilometer/storage/__init__.py index b836963180..61dcfd4ae0 100644 --- a/ceilometer/storage/__init__.py +++ b/ceilometer/storage/__init__.py @@ -35,7 +35,6 @@ STORAGE_ENGINE_NAMESPACE = 'ceilometer.storage' OLD_STORAGE_OPTS = [ cfg.StrOpt('database_connection', secret=True, - default=None, help='DEPRECATED - Database connection string.', ), ]