From 6853dbb181d5d0098d99544a8c6c7de1d8751395 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 13 Jun 2019 14:47:13 -0700
Subject: [PATCH] openqa/dispatcher: correct fedora-messaging priv auth vhost

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

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 64987681d0..903fb88020 100644
--- a/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2
+++ b/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2
@@ -4,7 +4,7 @@
 #
 # This file is in the TOML format.
 {% if deployment_type is defined %}
-amqp_url = "amqps://openqa{{ openqa_env_suffix }}:@rabbitmq{{ openqa_env_suffix }}.fedoraproject.org/%2Fpublic_pubsub"
+amqp_url = "amqps://openqa{{ openqa_env_suffix }}:@rabbitmq{{ openqa_env_suffix }}.fedoraproject.org/%2Fpubsub"
 {% else %}
 amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub"
 {% endif %}
diff --git a/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 b/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2
index 5b45a156dc..a1e59b7203 100644
--- a/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2
+++ b/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2
@@ -8,7 +8,7 @@
 # prod messages to schedule jobs in openQA staging, composes and
 # updates just don't show up on the staging broker.
 {% if deployment_type is defined %}
-amqp_url = "amqps://openqa:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub"
+amqp_url = "amqps://openqa:@rabbitmq.fedoraproject.org/%2Fpubsub"
 {% else %}
 amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub"
 {% endif %}
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 8eb1ee0e49..4c33c285a8 100644
--- a/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2
+++ b/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2
@@ -4,7 +4,7 @@
 #
 # This file is in the TOML format.
 {% if deployment_type is defined %}
-amqp_url = "amqps://openqa{{ openqa_env_suffix }}:@rabbitmq{{ openqa_env_suffix }}.fedoraproject.org/%2Fpublic_pubsub"
+amqp_url = "amqps://openqa{{ openqa_env_suffix }}:@rabbitmq{{ openqa_env_suffix }}.fedoraproject.org/%2Fpubsub"
 {% else %}
 amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub"
 {% endif %}