summaryrefslogtreecommitdiff
path: root/ceilometer/event
diff options
context:
space:
mode:
authorMehdi Abaakouk <sileht@redhat.com>2016-10-10 23:18:01 +0200
committerMehdi Abaakouk <sileht@redhat.com>2016-10-13 12:10:03 +0200
commit32fc7ebd20a1bd9df90735f99fdff0796d92517d (patch)
treed1ec1d277042a2f4a31b9d296baa31920bf0ab1b /ceilometer/event
parent967c06cbbe55927f517583b7bde1582a6e817e5b (diff)
downloadceilometer-32fc7ebd20a1bd9df90735f99fdff0796d92517d.tar.gz
declarative: stop using global conf
Change-Id: Ic000ae224cecd0fbf1db4b7068db5bfc468b3507
Diffstat (limited to 'ceilometer/event')
-rw-r--r--ceilometer/event/converter.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py
index 6806909c..fd0c55b8 100644
--- a/ceilometer/event/converter.py
+++ b/ceilometer/event/converter.py
@@ -289,6 +289,7 @@ class NotificationEventsConverter(object):
def setup_events(trait_plugin_mgr):
"""Setup the event definitions from yaml config file."""
return NotificationEventsConverter(
- declarative.load_definitions([], cfg.CONF.event.definitions_cfg_file),
+ declarative.load_definitions(cfg.CONF, [],
+ cfg.CONF.event.definitions_cfg_file),
trait_plugin_mgr,
add_catchall=not cfg.CONF.event.drop_unmatched_notifications)