From 3d4797ad73799dea10b6e6b0068567352230d189 Mon Sep 17 00:00:00 2001 From: Ildiko Vancsa Date: Mon, 14 Sep 2015 15:52:25 +0200 Subject: [PATCH] Deprecate config options of the old alarming functionality Related-Bug: #1495614 Change-Id: I965c39c05e86d38758ef30dc739c0b7cd4a011aa --- ceilometer/alarm/evaluator/gnocchi.py | 1 + ceilometer/alarm/notifier/rest.py | 4 ++++ ceilometer/alarm/rpc.py | 1 + ceilometer/alarm/service.py | 1 + ceilometer/api/controllers/v2/alarms.py | 4 ++++ ceilometer/storage/__init__.py | 2 ++ 6 files changed, 13 insertions(+) diff --git a/ceilometer/alarm/evaluator/gnocchi.py b/ceilometer/alarm/evaluator/gnocchi.py index 00462a47..809cb4f0 100644 --- a/ceilometer/alarm/evaluator/gnocchi.py +++ b/ceilometer/alarm/evaluator/gnocchi.py @@ -41,6 +41,7 @@ COMPARATORS = { OPTS = [ cfg.StrOpt('gnocchi_url', default="http://localhost:8041", + deprecated_for_removal=True, help='URL to Gnocchi.'), ] diff --git a/ceilometer/alarm/notifier/rest.py b/ceilometer/alarm/notifier/rest.py index 6cd004bc..786d3296 100644 --- a/ceilometer/alarm/notifier/rest.py +++ b/ceilometer/alarm/notifier/rest.py @@ -30,19 +30,23 @@ LOG = log.getLogger(__name__) OPTS = [ cfg.StrOpt('rest_notifier_certificate_file', default='', + deprecated_for_removal=True, help='SSL Client certificate for REST notifier.' ), cfg.StrOpt('rest_notifier_certificate_key', default='', + deprecated_for_removal=True, help='SSL Client private key for REST notifier.' ), cfg.BoolOpt('rest_notifier_ssl_verify', default=True, + deprecated_for_removal=True, help='Whether to verify the SSL Server certificate when ' 'calling alarm action.' ), cfg.IntOpt('rest_notifier_max_retries', default=0, + deprecated_for_removal=True, help='Number of retries for REST notifier', ), diff --git a/ceilometer/alarm/rpc.py b/ceilometer/alarm/rpc.py index 541be2af..a7d1a854 100644 --- a/ceilometer/alarm/rpc.py +++ b/ceilometer/alarm/rpc.py @@ -26,6 +26,7 @@ from ceilometer import messaging OPTS = [ cfg.StrOpt('notifier_rpc_topic', default='alarm_notifier', + deprecated_for_removal=True, help='The topic that ceilometer uses for alarm notifier ' 'messages.'), ] diff --git a/ceilometer/alarm/service.py b/ceilometer/alarm/service.py index d05a6758..f87352e4 100644 --- a/ceilometer/alarm/service.py +++ b/ceilometer/alarm/service.py @@ -37,6 +37,7 @@ from ceilometer import messaging OPTS = [ cfg.IntOpt('evaluation_interval', default=60, + deprecated_for_removal=True, help='Period of evaluation cycle, should' ' be >= than configured pipeline interval for' ' collection of underlying meters.', diff --git a/ceilometer/api/controllers/v2/alarms.py b/ceilometer/api/controllers/v2/alarms.py index 298d5c0d..39ab2425 100644 --- a/ceilometer/api/controllers/v2/alarms.py +++ b/ceilometer/api/controllers/v2/alarms.py @@ -57,18 +57,22 @@ LOG = log.getLogger(__name__) ALARM_API_OPTS = [ cfg.BoolOpt('record_history', default=True, + deprecated_for_removal=True, help='Record alarm change events.' ), cfg.IntOpt('user_alarm_quota', default=None, + deprecated_for_removal=True, help='Maximum number of alarms defined for a user.' ), cfg.IntOpt('project_alarm_quota', default=None, + deprecated_for_removal=True, help='Maximum number of alarms defined for a project.' ), cfg.IntOpt('alarm_max_actions', default=-1, + deprecated_for_removal=True, help='Maximum count of actions for each state of an alarm, ' 'non-positive number means no limit.'), ] diff --git a/ceilometer/storage/__init__.py b/ceilometer/storage/__init__.py index 5df4cec8..4b546c4e 100644 --- a/ceilometer/storage/__init__.py +++ b/ceilometer/storage/__init__.py @@ -57,10 +57,12 @@ OPTS = [ cfg.StrOpt('alarm_connection', secret=True, default=None, + deprecated_for_removal=True, help='The connection string used to connect to the alarm ' 'database. (if unset, connection is used)'), cfg.IntOpt('alarm_history_time_to_live', default=-1, + deprecated_for_removal=True, help=("Number of seconds that alarm histories are kept " "in the database for (<= 0 means forever).")), cfg.StrOpt('event_connection',