From 31f4668476d28e9b594ed1d8462abf82b8e21cfc Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 21 Jun 2023 12:25:21 +0200 Subject: [PATCH] openqa: tweak rabbit user creation stuff... ugh. Signed-off-by: Adam Williamson --- playbooks/groups/openqa.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 0ea051ce7c..0dd401f412 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -43,15 +43,24 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - # we must always make sure both prod and stg users exist, as stg + # we must always make sure the prod user exists, as stg # must listen on prod in several cases so uses the prod user - role: rabbit/user username: "{{ openqa_amqp_prod_username }}" sent_topics: ^org\.fedoraproject\.prod\.(openqa|ci)\..* + vars: + env: "production" + env_suffix: "" + tags: ['rabbit'] - role: rabbit/user username: "{{ openqa_amqp_stg_username }}" sent_topics: ^org\.fedoraproject\.stg\.(openqa|ci)\..* + vars: + env: "staging" + env_suffix: "stg" + tags: ['rabbit'] + when: "deployment_type == 'stg'" - role: rabbit/queue queue_name: "{{ openqa_amqp_scheduler_queue }}"