x
/
synergy-scheduler-manager
Code Issues Proposed changes

Add new "synergy_topic" parameter 

The new "synergy_topic" parameter simplifies the Synergy integration with Nova.

Bug: #1672409
Change-Id: I00f7e6ce7b6c4b22d9267d2b956c599fb71c68a2
Sem-Ver: feature
This commit is contained in:
Lisa Zangrando 2017-03-13 15:23:45 +01:00
parent b16ab75ca6
commit 56061a4aaf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/synergy_scheduler.conf
View File

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

8
synergy_scheduler_manager/nova_manager.py
View File

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