From 56061a4aafd89595043113654364c566a9065d22 Mon Sep 17 00:00:00 2001 From: Lisa Zangrando Date: Mon, 13 Mar 2017 15:23:45 +0100 Subject: [PATCH] Add new "synergy_topic" parameter The new "synergy_topic" parameter simplifies the Synergy integration with Nova. Bug: #1672409 Change-Id: I00f7e6ce7b6c4b22d9267d2b956c599fb71c68a2 Sem-Ver: feature --- config/synergy_scheduler.conf | 3 +++ synergy_scheduler_manager/nova_manager.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config/synergy_scheduler.conf b/config/synergy_scheduler.conf index ef184ab..159a007 100644 --- a/config/synergy_scheduler.conf +++ b/config/synergy_scheduler.conf @@ -135,6 +135,9 @@ amqp_virtual_host = / # set the Nova host (default: localhost) host = CONTROLLER_HOST +# set the Synergy topic as defined in nova-api.conf (default: synergy) +synergy_topic = synergy + # set the Nova conductor topic (default: conductor) conductor_topic = conductor diff --git a/synergy_scheduler_manager/nova_manager.py b/synergy_scheduler_manager/nova_manager.py index 55efe3c..b827e8e 100644 --- a/synergy_scheduler_manager/nova_manager.py +++ b/synergy_scheduler_manager/nova_manager.py @@ -243,6 +243,10 @@ class NovaManager(Manager): help="the amqp virtual host", default="/", required=False), + cfg.StrOpt("synergy_topic", + help="the Synergy topic", + default="synergy", + required=False), cfg.StrOpt("conductor_topic", help="the conductor topic", default="conductor", @@ -324,9 +328,9 @@ class NovaManager(Manager): host = self.getParameter("host") - conductor_topic = self.getParameter("conductor_topic") + synergy_topic = self.getParameter("synergy_topic") - synergy_topic = conductor_topic + "_synergy" + conductor_topic = self.getParameter("conductor_topic") self.getParameter("metadata_proxy_shared_secret", fallback=True)