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

@@ -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
 

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)