From 293930446b728fc0da8caf0b8ad9d721a6275e1b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Sat, 20 Jun 2026 11:11:23 +0200
Subject: [PATCH] openQA: try using old pki cert/key on staging

I'm having auth issues on openQA staging, I believe it *may* be
to do with the changes Aurelien made in
6fe8b98de21747dc16d59dcf5096da719a541296 . Let's see if using the
old key and cert helps.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 inventory/group_vars/openqa            | 1 +
 inventory/group_vars/openqa_lab        | 1 +
 roles/openqa/dispatcher/tasks/main.yml | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa
index c3579584e1..7327107c5d 100644
--- a/inventory/group_vars/openqa
+++ b/inventory/group_vars/openqa
@@ -3,6 +3,7 @@ deployment_type: prod
 external_hostname: openqa.fedoraproject.org
 freezes: false
 # AMQP publisher/listener-related stuff
+openqa_amqp_pki_dir: "pki"
 openqa_amqp_this_cacertfile: "{{ openqa_amqp_prod_cacertfile }}"
 openqa_amqp_this_certfile: "{{ openqa_amqp_prod_certfile }}"
 openqa_amqp_this_keyfile: "{{ openqa_amqp_prod_keyfile }}"
diff --git a/inventory/group_vars/openqa_lab b/inventory/group_vars/openqa_lab
index 8440cbdb0b..d36a616240 100644
--- a/inventory/group_vars/openqa_lab
+++ b/inventory/group_vars/openqa_lab
@@ -17,6 +17,7 @@ external_hostname: openqa.stg.fedoraproject.org
 freezes: false
 
 # AMQP publisher/listener-related stuff
+openqa_amqp_pki_dir: "pki.old"
 openqa_amqp_this_cacertfile: "{{ openqa_amqp_stg_cacertfile }}"
 openqa_amqp_this_certfile: "{{ openqa_amqp_stg_certfile }}"
 openqa_amqp_this_keyfile: "{{ openqa_amqp_stg_keyfile }}"
diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index ae7e07e6de..5139302f2a 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -288,7 +288,7 @@
 
 - name: Deploy the Fedora infra fedora-messaging cert
   ansible.builtin.copy:
-    src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/pki/issued/{{ openqa_amqp_this_username }}.crt"
+    src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/{{ openqa_amqp_pki_dir }}/issued/{{ openqa_amqp_this_username }}.crt"
     dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_this_username }}-cert.pem"
     mode: "0644"
     owner: root
@@ -300,7 +300,7 @@
 
 - name: Deploy the Fedora infra fedora-messaging key
   ansible.builtin.copy:
-    src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/pki/private/{{ openqa_amqp_this_username }}.key"
+    src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/{{ openqa_amqp_pki_dir }}/private/{{ openqa_amqp_this_username }}.key"
     dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_this_username }}-key.pem"
     mode: "0640"
     owner: root