From 74057f6ae5484bcb8c548a790d91ed30f6e415c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Thu, 16 Sep 2021 10:10:36 +0200 Subject: [PATCH] Zodbot: create the right username in rabbitmq MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- playbooks/groups/value.yml | 3 --- roles/supybot/tasks/main.yml | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 2ab6a1731b..d2b1d2229d 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -32,9 +32,6 @@ - apache - { role: fedmsg/base, when: inventory_hostname.startswith('value01') } - # Set up for fedora-messaging - - { role: rabbit/user, - username: "value{{ env_suffix }}"} - { role: fedmsg/irc, when: inventory_hostname.startswith('value01') } - supybot diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml index 12c51960a5..3e3f807aa9 100644 --- a/roles/supybot/tasks/main.yml +++ b/roles/supybot/tasks/main.yml @@ -86,6 +86,15 @@ - meetbot - supybot + # Set up for fedora-messaging +- name: Create the RabbitMQ user + import_role: + name: rabbit/user + username: "{{ botname }}" + when: + - env == "staging" + - inventory_hostname.startswith('value02') + - name: Create /etc/pki/fedora-messaging (stg) file: dest: /etc/pki/fedora-messaging