Revert "openQA: try using old pki cert/key on staging"

This reverts commit 293930446b. It
doesn't look like it helped.

inventory/group_vars/openqa

@@ -3,7 +3,6 @@ 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 }}"

inventory/group_vars/openqa_lab

@@ -17,7 +17,6 @@ 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 }}"

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 }}/{{ openqa_amqp_pki_dir }}/issued/{{ openqa_amqp_this_username }}.crt"
+    src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/pki/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 }}/{{ openqa_amqp_pki_dir }}/private/{{ openqa_amqp_this_username }}.key"
+    src: "{{ private }}/files/rabbitmq/{{ openqa_env }}/pki/private/{{ openqa_amqp_this_username }}.key"
     dest: "/etc/pki/fedora-messaging/{{ openqa_amqp_this_username }}-key.pem"
     mode: "0640"
     owner: root