diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index cb79ff7991..054e1734b7 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -40,6 +40,14 @@ thresholds: warning: 10 critical: 100 + - role: rabbit/queue + username: "mirror_pagure_ansible{{ env_suffix }}" + queue_name: "mirror_pagure_ansible{{ env_suffix }}_13" + routing_keys: + - "io.pagure.*.pagure.git.receive" + thresholds: + warning: 10 + critical: 100 - batcave - { role: nfs/client, when: inventory_hostname.startswith('batcave'), mnt_dir: '/srv/web/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs/client, when: inventory_hostname.startswith('batcave01'), mnt_dir: '/mnt/fedora/app', nfs_src_dir: 'fedora_app/app' } diff --git a/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg b/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg index 0f68d667bc..c474599ad3 100644 --- a/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg +++ b/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg @@ -8,14 +8,21 @@ callback = "mirror_from_pagure_bus:MirrorFromPagure" # Don't use topic_prefix, since outgoing message topics are derived from incoming messages. # topic_prefix = "" -# Note the double brackets below. -# To add another binding, add another [[bindings]] section. +{% if inventory_hostname.startswith('batcave01.') %} [[bindings]] queue = "mirror_pagure_ansible{{ env_suffix }}" exchange = "amq.topic" routing_keys = [ "io.pagure.*.pagure.git.receive", ] +{% elif inventory_hostname.startswith('batcave13.') %} +[[bindings]] +queue = "mirror_pagure_ansible{{ env_suffix }}_13" +exchange = "amq.topic" +routing_keys = [ + "io.pagure.*.pagure.git.receive", +] +{% endif %} [tls] ca_cert = "/etc/pki/fedora-messaging/cacert.pem" @@ -27,7 +34,11 @@ app = "mirror_from_pagure" app_url = "https://pagure.io/fedora-infra/mirror_from_pagure" app_contacts_email = ["pingou@fedoraproject.org"] +{% if inventory_hostname.startswith('batcave01.') %} [queues."mirror_pagure_ansible{{ env_suffix }}"] +{% elif inventory_hostname.startswith('batcave13.') %} +[queues."mirror_pagure_ansible{{ env_suffix }}_13"] +{% endif %} durable = true auto_delete = false exclusive = false