From 42a9b50f057b62dde87d243627a726fe6f4526cb Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 14 Jun 2019 12:16:17 -0700
Subject: [PATCH] openqa/dispatcher: add zmq exchange binding to messaging
 configs

Otherwise we don't get messages from the ZMQ->AMQP bridge.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 .../fedora_openqa_resultsdb_reporter.toml.j2        | 13 +++++++++++++
 .../templates/fedora_openqa_scheduler.toml.j2       | 12 ++++++++++++
 .../templates/fedora_openqa_wiki_reporter.toml.j2   | 13 +++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2 b/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2
index 0e55ee8896..5b50173fcc 100644
--- a/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2
+++ b/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2
@@ -62,6 +62,19 @@ routing_keys = ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
 {% else %}
 routing_keys = ["org.fedoraproject.prod.openqa.job.done"]
 {% endif %}
+# need this to receive messages from ZMQ->AMQP bridge
+[[bindings]]
+{% if deployment_type is defined %}
+queue = "openqa{{ openqa_env_suffix }}_resultsdb_reporter"
+{% else %}
+queue = "{{ openqa_resultsdb_reporter_uuid }}"
+{% endif %}
+exchange = "zmq.topic"
+{% if deployment_type is defined %}
+routing_keys = ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
+{% else %}
+routing_keys = ["org.fedoraproject.prod.openqa.job.done"]
+{% endif %}
 
 [consumer_config]
 openqa_hostname = "{{ openqa_hostname }}"
diff --git a/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 b/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2
index 25485bfdbf..80187e40e0 100644
--- a/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2
+++ b/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2
@@ -63,6 +63,18 @@ exchange = "amq.topic"
 routing_keys = ["org.fedoraproject.prod.pungi.compose.status.change",
                 "org.fedoraproject.prod.bodhi.update.request.testing",
                 "org.fedoraproject.prod.bodhi.update.edit"]
+# need this to receive messages from ZMQ->AMQP bridge
+[[bindings]]
+{% if deployment_type is defined %}
+queue = "openqa{{ openqa_env_suffix }}_scheduler"
+{% else %}
+queue = "{{ openqa_scheduler_uuid }}"
+{% endif %}
+exchange = "zmq.topic"
+routing_keys = ["org.fedoraproject.prod.pungi.compose.status.change",
+                "org.fedoraproject.prod.bodhi.update.request.testing",
+                "org.fedoraproject.prod.bodhi.update.edit"]
+
 
 [consumer_config]
 openqa_hostname = "{{ openqa_hostname }}"
diff --git a/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2 b/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2
index fc5284c419..e784120c0c 100644
--- a/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2
+++ b/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2
@@ -62,6 +62,19 @@ routing_keys = ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
 {% else %}
 routing_keys = ["org.fedoraproject.prod.openqa.job.done"]
 {% endif %}
+# need this to receive messages from ZMQ->AMQP bridge
+[[bindings]]
+{% if deployment_type is defined %}
+queue = "openqa{{ openqa_env_suffix }}_wiki_reporter"
+{% else %}
+queue = "{{ openqa_wiki_reporter_uuid }}"
+{% endif %}
+exchange = "zmq.topic"
+{% if deployment_type is defined %}
+routing_keys = ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"]
+{% else %}
+routing_keys = ["org.fedoraproject.prod.openqa.job.done"]
+{% endif %}
 
 [consumer_config]
 openqa_hostname = "{{ openqa_hostname }}"