From 64ffac4caf5fc31b36a64f62d20ea7c4d4e253b7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 3 Jul 2025 12:05:00 -0700 Subject: [PATCH] haproxy: only proxy rabbitmq on rdu3 proxies Prior to 38d138e this condition existed with 'iad2' instead of 'rdu3'. @abompard took it out entirely, but that was wrong, it makes the external proxies include this block. We need to put the condition back with the correct data center name. Signed-off-by: Adam Williamson --- roles/haproxy/templates/haproxy.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 6b2f19c527..188ab30df0 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -258,6 +258,7 @@ backend kojipkgs-backend option httpchk GET / {% endif %} +{% if datacenter == "rdu3" %} # These ports are for proxying rabbitmq (AMQP) protocol through. # At this moment, internal- and public-rabbitmq both point to the exact same set of # brokers on the backend, but the internal- is intended for applications we directly control. @@ -281,6 +282,7 @@ backend rabbitmq server rabbitmq01 rabbitmq01:5671 weight 1 maxconn 16384 server rabbitmq02 rabbitmq02:5671 weight 1 maxconn 16384 server rabbitmq03 rabbitmq03:5671 weight 1 maxconn 16384 +{% endif %} {% if 'rdu3' in inventory_hostname %} frontend zabbix-frontend