From 4b6114f3792e9cf7d03f9f5fcbe72285e424c818 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Tue, 19 Apr 2016 02:47:25 +0800 Subject: [PATCH] remove deprecated option alarm_connection alarm_connection is deprecated since liberty, it is ready to be removed and let's use recommended database.connection Change-Id: I0130c9065f01beda40ef3985300701b8788606c7 --- aodh/storage/__init__.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/aodh/storage/__init__.py b/aodh/storage/__init__.py index d1a022a03..af6c23286 100644 --- a/aodh/storage/__init__.py +++ b/aodh/storage/__init__.py @@ -35,11 +35,6 @@ OPTS = [ default=-1, help=("Number of seconds that alarm histories are kept " "in the database for (<= 0 means forever).")), - cfg.StrOpt('alarm_connection', - secret=True, - deprecated_for_removal=True, - help='The connection string used to connect ' - 'to the alarm database - rather use ${database.connection}'), ] @@ -57,10 +52,7 @@ class AlarmNotFound(Exception): def get_connection_from_config(conf): retries = conf.database.max_retries - if conf.database.alarm_connection is None: - url = conf.database.connection - else: - url = conf.database.alarm_connection + url = conf.database.connection connection_scheme = urlparse.urlparse(url).scheme if connection_scheme not in ('mysql', 'mysql+pymysql', 'postgresql', 'sqlite'):