diff --git a/inventory/group_vars/odcs_backend_releng b/inventory/group_vars/odcs_backend_releng index fa8b65c77e..1f0dc6b7e0 100644 --- a/inventory/group_vars/odcs_backend_releng +++ b/inventory/group_vars/odcs_backend_releng @@ -1,2 +1,6 @@ odcs_celery_queues: ["releng_raw_pungi_composes", "releng_pungi_composes", "cleanup", "eln_raw_pungi_composes", "cccc_raw_pungi_composes"] +fmc_queue_name: "fmc{{ env_suffix }}_composer" +# Define the topics that our fedora-messaging queue should be subscribed to. +fmc_routing_keys: + - "org.fedoraproject.prod.buildsys.rpm.sign" diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index 728bdc8bb0..957ee3fcd6 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -107,6 +107,15 @@ - role: keytab/service service: odcs host: "odcs-backend-releng01.phx2.fedoraproject.org" + - role: rabbit/user + username: "fmc{{ env_suffix }}" + - role: rabbit/queue + username: "fmc{{ env_suffix }}" + queue_name: "{{ fmc_queue_name }}" + routing_keys: "{{ fmc_routing_keys }}" + thresholds: + warning: 100 + critical: 1000 - role: fmc host: "odcs-backend-releng01.phx2.fedoraproject.org" diff --git a/roles/fmc/templates/fedora-minimal-compose.toml b/roles/fmc/templates/fedora-minimal-compose.toml index 8478226057..25324f8f26 100644 --- a/roles/fmc/templates/fedora-minimal-compose.toml +++ b/roles/fmc/templates/fedora-minimal-compose.toml @@ -1,7 +1,7 @@ # A basic configuration for Fedora's message broker # # This file is in the TOML format. -amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub" +amqp_url = "amqps://bodhi{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub" callback = "fedora-minimal-compose:Consumer" [tls] @@ -27,16 +27,16 @@ arguments = {} # # If you require a stronger guarantee about delivery, please talk to Fedora's # Infrastructure team. -[queues.00000000-0000-0000-0000-000000000000] +[queues."{{ fmc_queue_name }}"] durable = false auto_delete = true exclusive = true arguments = {} [[bindings]] -queue = "00000000-0000-0000-0000-000000000000" +queue = "{{ fmc_queue_name }}" exchange = "amq.topic" -routing_keys = ["org.fedoraproject.prod.buildsys.rpm.sign"] +routing_keys = ["{{ fmc_routing_keys }}"] [consumer_config] rawhide = {{FedoraRawhideNumber}} @@ -83,4 +83,4 @@ handlers = ["console"] [log_config.root] level = "ERROR" -handlers = ["console"] \ No newline at end of file +handlers = ["console"]