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 <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi
2025-07-17 18:00:47 -07:00
parent ca1185ec42
commit 72789a919f
6 changed files with 12 additions and 12 deletions

View File

@@ -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_vhost: /pubsub
queue_default_exchange: amq.topic queue_default_exchange: amq.topic
queue_routing_keys: [] queue_routing_keys: []
@@ -8,4 +8,4 @@ queue_max_priority: null
queue_thresholds: queue_thresholds:
warning: 10000 warning: 10000
critical: 100000 critical: 100000
queue_nagios_server: noc01.{{ datacenter }}.fedoraproject.org queue_nagios_server: noc01.rdu3.fedoraproject.org

View File

@@ -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_vhost: /pubsub
user_publish_only: true user_publish_only: true

View File

@@ -1,2 +1,2 @@
--- ---
rabbitmq_server: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org" rabbitmq_server: "rabbitmq01{{ env_suffix }}.rdu3.fedoraproject.org"

View File

@@ -418,7 +418,7 @@
vhost: /public_pubsub vhost: /public_pubsub
vars: vars:
federation_upstream_value: 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" ack-mode: "on-confirm"
- name: Configure a policy to federate the pubsub topic exchange to public_pubsub - name: Configure a policy to federate the pubsub topic exchange to public_pubsub

View File

@@ -67,7 +67,7 @@ default_user_tags.administrator = true
## Clustering ## Clustering
## ===================== ## =====================
## ##
cluster_name = {{env_prefix}}{{datacenter}}.fedoraproject.org cluster_name = {{env_prefix}}rdu3.fedoraproject.org
cluster_partition_handling = autoheal cluster_partition_handling = autoheal
## Make clustering happen *automatically* at startup. Only applied ## 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.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.1 = rabbit@rabbitmq01{{env_suffix}}.rdu3.fedoraproject.org
cluster_formation.classic_config.nodes.2 = rabbit@rabbitmq02{{env_suffix}}.{{datacenter}}.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}}.{{datacenter}}.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 ## This node's type can be configured. If you are not sure
## what node type to use, always use 'disc'. ## what node type to use, always use 'disc'.

View File

@@ -14,9 +14,9 @@
{auth_mechanisms, ['EXTERNAL']}, {auth_mechanisms, ['EXTERNAL']},
%% Here goes the cluster config %% Here goes the cluster config
{cluster_nodes, {['rabbit@rabbitmq01{{env_suffix}}.{{datacenter}}.fedoraproject.org', {cluster_nodes, {['rabbit@rabbitmq01{{env_suffix}}.rdu3.fedoraproject.org',
'rabbit@rabbitmq02{{env_suffix}}.{{datacenter}}.fedoraproject.org', 'rabbit@rabbitmq02{{env_suffix}}.rdu3.fedoraproject.org',
'rabbit@rabbitmq03{{env_suffix}}.{{datacenter}}.fedoraproject.org'], 'rabbit@rabbitmq03{{env_suffix}}.rdu3.fedoraproject.org'],
disc}}, disc}},
%% How to respond to cluster partitions. %% How to respond to cluster partitions.