From c6f7513c38074204ecffde7de98278764a65c058 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 28 Jun 2019 23:30:25 +0200
Subject: [PATCH] messaging/base: try to depend on rabbit/user automatically

---
 playbooks/groups/copr-backend.yml   | 3 ---
 roles/messaging/base/tasks/main.yml | 8 ++++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/playbooks/groups/copr-backend.yml b/playbooks/groups/copr-backend.yml
index 59bd828874..4f28165656 100644
--- a/playbooks/groups/copr-backend.yml
+++ b/playbooks/groups/copr-backend.yml
@@ -48,6 +48,3 @@
   - nagios_client
   - { role: messaging/base,
       when: devel }
-  - { role: rabbit/user,
-      username: "copr{{ env_suffix }}",
-      when: devel }
diff --git a/roles/messaging/base/tasks/main.yml b/roles/messaging/base/tasks/main.yml
index e8f904e8c1..1e7313f650 100644
--- a/roles/messaging/base/tasks/main.yml
+++ b/roles/messaging/base/tasks/main.yml
@@ -51,3 +51,11 @@
   with_items: "{{ messaging.certificates }}"
   tags:
   - fedora-messaging
+
+- name: "make sure the user {{ item.username }} exists on broker"
+  include_role: name=rabbit/user
+  vars:
+  - username: "{{ item.username }}{{ env_suffix }}"
+  with_items: "{{ messaging.certificates }}"
+  tags:
+  - fedora-messaging