From 1ea192935a8f5338290ad356b586ff14658cc52b Mon Sep 17 00:00:00 2001 From: Shuquan Huang Date: Sun, 8 Nov 2015 11:22:41 +0800 Subject: [PATCH] remove default=None for config options In the cfg module default=None is set as the default value. Change-Id: I2c717e39d7b5d9c80d1e5556f029f6aea0d290fe Closes-bug: #1323975 --- aodh/api/controllers/v2/alarms.py | 2 -- aodh/coordination.py | 1 - aodh/storage/__init__.py | 1 - 3 files changed, 4 deletions(-) diff --git a/aodh/api/controllers/v2/alarms.py b/aodh/api/controllers/v2/alarms.py index 3bb793294..51569193b 100644 --- a/aodh/api/controllers/v2/alarms.py +++ b/aodh/api/controllers/v2/alarms.py @@ -56,12 +56,10 @@ LOG = log.getLogger(__name__) ALARM_API_OPTS = [ cfg.IntOpt('user_alarm_quota', - default=None, deprecated_group="alarm", help='Maximum number of alarms defined for a user.' ), cfg.IntOpt('project_alarm_quota', - default=None, deprecated_group="alarm", help='Maximum number of alarms defined for a project.' ), diff --git a/aodh/coordination.py b/aodh/coordination.py index f77ba3702..e351e92ad 100644 --- a/aodh/coordination.py +++ b/aodh/coordination.py @@ -26,7 +26,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/aodh/storage/__init__.py b/aodh/storage/__init__.py index 40e8bab02..47a8a4072 100644 --- a/aodh/storage/__init__.py +++ b/aodh/storage/__init__.py @@ -36,7 +36,6 @@ OPTS = [ "in the database for (<= 0 means forever).")), cfg.StrOpt('alarm_connection', secret=True, - default=None, deprecated_for_removal=True, help='The connection string used to connect ' 'to the alarm database - rather use ${database.connection}'),