Move the ELNBuildSync queue setup

Now that ELNBuildSync is being deployed via Ansible, we should keep its
queue setup with the rest of the playbook.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED

playbooks/openshift-apps/elnbuildsync.yml

@@ -31,6 +31,25 @@
     - /srv/private/ansible/vars.yml
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
+  pre_tasks:
+  - name: Set up ELN RabbitMQ queue
+    run_once: true
+    include_role:
+      name: rabbit/queue
+    vars:
+      queue_username: distrobuildsync-eln
+      user_sent_topics: ^$
+      queue_name: distrobuildsync-eln
+      # TTL: 10 days (in miliseconds)
+      queue_message_ttl: 864000000
+      queue_routing_keys:
+        - "#.buildsys.repo.init"
+        - "#.buildsys.repo.done"
+        - "#.buildsys.tag"
+        - "#.buildsys.task.state.change"
+        - "org.fedoraproject.{{ env_short }}.elnbuildsync.#"
+    when: env != 'staging'
+
   roles:
   - role: openshift/project
     project_app: elnbuildsync

roles/rabbitmq_cluster/tasks/apps.yml

@@ -140,27 +140,6 @@
 
 # CENTOS STREAM robosignatory END
 
-# ELN BEGIN
-
-- name: Eln queue
-  run_once: true
-  include_role:
-    name: rabbit/queue
-  vars:
-    queue_username: distrobuildsync-eln
-    user_sent_topics: ^$
-    queue_name: distrobuildsync-eln
-    # TTL: 10 days (in miliseconds)
-    queue_message_ttl: 864000000
-    queue_routing_keys:
-      - "#.buildsys.repo.init"
-      - "#.buildsys.repo.done"
-      - "#.buildsys.tag"
-      - "#.buildsys.task.state.change"
-  when: env != 'staging'
-
-# ELN END
-
 # ELN-CentOS Stream Syncing BEGIN
 
 - name: ELN-CS Sync queue