From 7b141d0c1ebcc2fe210dd51cc43e0040c5b5d13d Mon Sep 17 00:00:00 2001 From: Romain Ziba Date: Thu, 21 May 2015 11:41:27 +0200 Subject: [PATCH] Add notifier to get the notification_topics option The notifier will be used in the future Change-Id: I38ac4ba24a7848877c1423c86f3ce86223984171 --- cerberus/manager.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/cerberus/manager.py b/cerberus/manager.py index a6b6e4c..ae404a6 100644 --- a/cerberus/manager.py +++ b/cerberus/manager.py @@ -32,13 +32,6 @@ from plugins import base LOG = log.getLogger(__name__) -OPTS = [ - cfg.ListOpt('notification_topics', default=['notifications', ], - help='AMQP topic used for OpenStack notifications'), -] - -cfg.CONF.register_opts(OPTS) - class CerberusManager(service.CerberusService): @@ -100,6 +93,10 @@ class CerberusManager(service.CerberusService): self.notification_server = None super(CerberusManager, self).start() + transport = messaging.get_transport(cfg.CONF) + notifier = messaging.Notifier(transport) + notifier.prepare() + targets = [] plugins = [] self.cerberus_manager = self._get_cerberus_manager() @@ -121,8 +118,6 @@ class CerberusManager(service.CerberusService): self.add_stored_tasks() - transport = messaging.get_transport(cfg.CONF) - if transport: rpc_target = messaging.Target(topic='test_rpc', server='server1') self.rpc_server = messaging.get_rpc_server(transport, rpc_target,