From 4b7877f6293c799bfc5242664a37638b30b05d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Fri, 21 Jun 2024 09:59:18 +0200 Subject: [PATCH] Mirrormanager: fix rabbitmq cert name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- playbooks/openshift-apps/mirrormanager.yml | 4 ++-- .../mirrormanager/templates/fedora-messaging.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/openshift-apps/mirrormanager.yml b/playbooks/openshift-apps/mirrormanager.yml index fe7b2f9b7c..ae6453b0b1 100644 --- a/playbooks/openshift-apps/mirrormanager.yml +++ b/playbooks/openshift-apps/mirrormanager.yml @@ -122,12 +122,12 @@ app: mirrormanager secret_name: fedora-messaging-crt key: cert.pem - privatefile: "rabbitmq/{{env}}/pki/issued/mirrormanager{{env_suffix}}.crt" + privatefile: "rabbitmq/{{env}}/pki/issued/mirrormanager2{{env_suffix}}.crt" - role: openshift/secret-file app: mirrormanager secret_name: fedora-messaging-key key: key.pem - privatefile: "rabbitmq/{{env}}/pki/private/mirrormanager{{env_suffix}}.key" + privatefile: "rabbitmq/{{env}}/pki/private/mirrormanager2{{env_suffix}}.key" # Deployment config - role: openshift/object diff --git a/roles/openshift-apps/mirrormanager/templates/fedora-messaging.toml b/roles/openshift-apps/mirrormanager/templates/fedora-messaging.toml index 193dcbb7ce..b8fcc2ec39 100644 --- a/roles/openshift-apps/mirrormanager/templates/fedora-messaging.toml +++ b/roles/openshift-apps/mirrormanager/templates/fedora-messaging.toml @@ -1,4 +1,4 @@ -amqp_url = "amqps://mirrormanager{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub" +amqp_url = "amqps://mirrormanager2{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub" # Just check if the queue exist, don't try to create it (the server does not allow it). passive_declares = true