From 58bf26334690b7869ae59b95c05d36a06ab1c000 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 3 Apr 2019 09:46:35 +0200 Subject: [PATCH] Greenwave: use the rabbit/queue role to create the greenwave queue Signed-off-by: Clement Verna --- playbooks/openshift-apps/greenwave.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index 1b9feb8f72..f50861927a 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -8,21 +8,16 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - tasks: - - name: Create the user in RabbitMQ - delegate_to: "rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org" - rabbitmq_user: - user: "greenwave{{ env_suffix }}" - vhost: "/pubsub" - read_priv: "amq\\.topic" # Publish only, no reading - write_priv: "amq\\.topic" - configure_priv: "^$" # No configuration permissions - state: present - tags: - - config - - fedora-messaging roles: + + - role: rabbit/queue + username: greenwave{{ env_suffix }} + queue_name: greenwave + routing_keys: + - "org.fedoraproject.*.taskotron.result.new" + - "org.fedoraproject.*.waiver.new" + # The openshift/project role breaks if the project already exists: # https://pagure.io/fedora-infrastructure/issue/6404 - role: openshift/project