From ea89a0f8d21c06506c186f666a7c6b39d8182631 Mon Sep 17 00:00:00 2001 From: Lisa Zangrando Date: Wed, 25 Jan 2017 10:56:53 +0100 Subject: [PATCH] Synergy and Ceilometer compete for consuming AMQP notifications Synergy and Ceilometer compete for consuming the notifications about the VM state changes because both listen on the "notifications" AMQP topic. - added a new configuration parameter for SchedulerMaanger: "notification_topic" Change-Id: I444aeac5539bc4b6994f8722637e7aba7d82dc78 Sem-Ver: bugfix --- synergy_scheduler_manager/scheduler_manager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/synergy_scheduler_manager/scheduler_manager.py b/synergy_scheduler_manager/scheduler_manager.py index e3564a7..dca0dc7 100644 --- a/synergy_scheduler_manager/scheduler_manager.py +++ b/synergy_scheduler_manager/scheduler_manager.py @@ -316,6 +316,7 @@ class SchedulerManager(Manager): super(SchedulerManager, self).__init__("SchedulerManager") self.config_opts = [ + cfg.StrOpt("notification_topic", default="notifications"), cfg.IntOpt("backfill_depth", default=100), cfg.FloatOpt("default_TTL", default=10.0), cfg.ListOpt("projects", default=[], help="the projects list"), @@ -347,6 +348,7 @@ class SchedulerManager(Manager): self.fairshare_manager = self.getManager("FairShareManager") self.default_TTL = float(CONF.SchedulerManager.default_TTL) self.backfill_depth = CONF.SchedulerManager.backfill_depth + self.notification_topic = CONF.SchedulerManager.notification_topic self.projects = {} self.listener = None self.exit = False @@ -494,8 +496,8 @@ class SchedulerManager(Manager): self.notifications = Notifications(self.projects, self.nova_manager) - target = self.nova_manager.getTarget(topic='notifications', - exchange="nova") + target = self.nova_manager.getTarget( + topic=self.notification_topic, exchange="nova") self.listener = self.nova_manager.getNotificationListener( targets=[target],