Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

openqa/dispatcher: add zmq exchange binding to messaging configs

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

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-06-14 12:16:17 -07:00
parent 080701af48
commit 42a9b50f05
3 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2
View file

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

12
roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2
View file

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

13
roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2
View file

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