messaging/base: try to depend on rabbit/user automatically

2019-06-28 23:30:25 +02:00 · 2019-06-28 23:30:25 +02:00 · c6f7513c38
commit c6f7513c38
parent 1f78af15fc
2 changed files with 8 additions and 3 deletions
--- 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 }
--- 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