From 72789a919f4a964401e17c8e3863de8affcd36b0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 17 Jul 2025 18:00:47 -0700 Subject: [PATCH] rabbitmq: switch datacenter out for rdu3 This was useful when we had clusters in iad2 and rdu3, but it didn't actually quite work then and it definitely doesn't now. :) Datacenters like 'aws' do not have their own clusters, they use the one in rdu3. So, just switch it back to hard coding. Signed-off-by: Kevin Fenzi --- roles/rabbit/queue/defaults/main.yml | 4 ++-- roles/rabbit/user/defaults/main.yml | 2 +- roles/rabbit/vhost/defaults/main.yml | 2 +- roles/rabbitmq_cluster/tasks/main.yml | 2 +- roles/rabbitmq_cluster/templates/rabbitmq.conf.j2 | 8 ++++---- roles/rabbitmq_cluster/templates/rabbitmq.config.j2 | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/rabbit/queue/defaults/main.yml b/roles/rabbit/queue/defaults/main.yml index 64020ad98c..a2e0e9e744 100644 --- a/roles/rabbit/queue/defaults/main.yml +++ b/roles/rabbit/queue/defaults/main.yml @@ -1,5 +1,5 @@ --- -queue_rabbitmq_server: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" +queue_rabbitmq_server: "rabbitmq01{{ env_suffix }}.rdu3.fedoraproject.org" queue_vhost: /pubsub queue_default_exchange: amq.topic queue_routing_keys: [] @@ -8,4 +8,4 @@ queue_max_priority: null queue_thresholds: warning: 10000 critical: 100000 -queue_nagios_server: noc01.{{ datacenter }}.fedoraproject.org +queue_nagios_server: noc01.rdu3.fedoraproject.org diff --git a/roles/rabbit/user/defaults/main.yml b/roles/rabbit/user/defaults/main.yml index fd15b3170a..e4530c574a 100644 --- a/roles/rabbit/user/defaults/main.yml +++ b/roles/rabbit/user/defaults/main.yml @@ -1,5 +1,5 @@ --- -user_rabbitmq_server: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" +user_rabbitmq_server: "rabbitmq01{{ env_suffix }}.rdu3.fedoraproject.org" user_vhost: /pubsub user_publish_only: true diff --git a/roles/rabbit/vhost/defaults/main.yml b/roles/rabbit/vhost/defaults/main.yml index 68abe8ae74..8e98ffd13d 100644 --- a/roles/rabbit/vhost/defaults/main.yml +++ b/roles/rabbit/vhost/defaults/main.yml @@ -1,2 +1,2 @@ --- -rabbitmq_server: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" +rabbitmq_server: "rabbitmq01{{ env_suffix }}.rdu3.fedoraproject.org" diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml index a04e03ab10..ac68d8b83f 100644 --- a/roles/rabbitmq_cluster/tasks/main.yml +++ b/roles/rabbitmq_cluster/tasks/main.yml @@ -418,7 +418,7 @@ vhost: /public_pubsub vars: federation_upstream_value: - uri: "amqps://pubsub_federation:@rabbitmq01{{env_suffix}}.{{datacenter}}.fedoraproject.org/%2Fpubsub?cacertfile=%2Fetc%2Frabbitmq%2Fca.crt&certfile=%2Fetc%2Frabbitmq%2Fpubsub_federation%2Fclient_cert.pem&keyfile=%2Fetc%2Frabbitmq%2Fpubsub_federation%2Fclient_key.pem&verify=verify_peer&server_name_indication=rabbitmq{{env_suffix}}.fedoraproject.org&auth_mechanism=external" + uri: "amqps://pubsub_federation:@rabbitmq01{{env_suffix}}.rdu3.fedoraproject.org/%2Fpubsub?cacertfile=%2Fetc%2Frabbitmq%2Fca.crt&certfile=%2Fetc%2Frabbitmq%2Fpubsub_federation%2Fclient_cert.pem&keyfile=%2Fetc%2Frabbitmq%2Fpubsub_federation%2Fclient_key.pem&verify=verify_peer&server_name_indication=rabbitmq{{env_suffix}}.fedoraproject.org&auth_mechanism=external" ack-mode: "on-confirm" - name: Configure a policy to federate the pubsub topic exchange to public_pubsub diff --git a/roles/rabbitmq_cluster/templates/rabbitmq.conf.j2 b/roles/rabbitmq_cluster/templates/rabbitmq.conf.j2 index 4f473ff24f..7a112620fc 100644 --- a/roles/rabbitmq_cluster/templates/rabbitmq.conf.j2 +++ b/roles/rabbitmq_cluster/templates/rabbitmq.conf.j2 @@ -67,7 +67,7 @@ default_user_tags.administrator = true ## Clustering ## ===================== ## -cluster_name = {{env_prefix}}{{datacenter}}.fedoraproject.org +cluster_name = {{env_prefix}}rdu3.fedoraproject.org cluster_partition_handling = autoheal ## Make clustering happen *automatically* at startup. Only applied @@ -77,9 +77,9 @@ cluster_partition_handling = autoheal ## cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config -cluster_formation.classic_config.nodes.1 = rabbit@rabbitmq01{{env_suffix}}.{{datacenter}}.fedoraproject.org -cluster_formation.classic_config.nodes.2 = rabbit@rabbitmq02{{env_suffix}}.{{datacenter}}.fedoraproject.org -cluster_formation.classic_config.nodes.3 = rabbit@rabbitmq03{{env_suffix}}.{{datacenter}}.fedoraproject.org +cluster_formation.classic_config.nodes.1 = rabbit@rabbitmq01{{env_suffix}}.rdu3.fedoraproject.org +cluster_formation.classic_config.nodes.2 = rabbit@rabbitmq02{{env_suffix}}.rdu3.fedoraproject.org +cluster_formation.classic_config.nodes.3 = rabbit@rabbitmq03{{env_suffix}}.rdu3.fedoraproject.org ## This node's type can be configured. If you are not sure ## what node type to use, always use 'disc'. diff --git a/roles/rabbitmq_cluster/templates/rabbitmq.config.j2 b/roles/rabbitmq_cluster/templates/rabbitmq.config.j2 index 9dbe31577c..fcca02fa3f 100644 --- a/roles/rabbitmq_cluster/templates/rabbitmq.config.j2 +++ b/roles/rabbitmq_cluster/templates/rabbitmq.config.j2 @@ -14,9 +14,9 @@ {auth_mechanisms, ['EXTERNAL']}, %% Here goes the cluster config - {cluster_nodes, {['rabbit@rabbitmq01{{env_suffix}}.{{datacenter}}.fedoraproject.org', - 'rabbit@rabbitmq02{{env_suffix}}.{{datacenter}}.fedoraproject.org', - 'rabbit@rabbitmq03{{env_suffix}}.{{datacenter}}.fedoraproject.org'], + {cluster_nodes, {['rabbit@rabbitmq01{{env_suffix}}.rdu3.fedoraproject.org', + 'rabbit@rabbitmq02{{env_suffix}}.rdu3.fedoraproject.org', + 'rabbit@rabbitmq03{{env_suffix}}.rdu3.fedoraproject.org'], disc}}, %% How to respond to cluster partitions.