Use the combined RabbitMQ CA cert in the clients

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
2025-04-10 12:42:58 +02:00 · 2025-04-10 12:42:58 +02:00 · d884a0f8ba
commit d884a0f8ba
parent 9d6f7c0f6f
44 changed files with 47 additions and 47 deletions
--- a/playbooks/openshift-apps/badges.yml
+++ b/playbooks/openshift-apps/badges.yml
@ -146,7 +146,7 @@
      secret_file_app: badges
      secret_file_secret_name: fedora-messaging-ca
      secret_file_key: cacert.pem
-      secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+      secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
    - role: openshift/secret-file
      secret_file_app: badges
      secret_file_secret_name: fedora-messaging-crt
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@ -83,7 +83,7 @@
    secret_file_app: bodhi
    secret_file_secret_name: bodhi-fedora-messaging-ca
    secret_file_key: cacert.pem
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
  - role: openshift/secret-file
    secret_file_app: bodhi
    secret_file_secret_name: bodhi-fedora-messaging-crt
--- a/playbooks/openshift-apps/bugzilla2fedmsg.yml
+++ b/playbooks/openshift-apps/bugzilla2fedmsg.yml
@ -29,7 +29,7 @@
    secret_file_app: bugzilla2fedmsg
    secret_file_secret_name: fedora-messaging-ca
    secret_file_key: cacert.pem
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

  - role: openshift/secret-file
    secret_file_app: bugzilla2fedmsg
--- a/playbooks/openshift-apps/cloud-image-uploader.yml
+++ b/playbooks/openshift-apps/cloud-image-uploader.yml
@ -92,7 +92,7 @@
    secret_file_app: cloud-image-uploader
    secret_file_secret_name: cloud-image-uploader-fedora-messaging-ca
    secret_file_key: cloud-image-uploader.ca
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

  - role: openshift/secret-file
    secret_file_app: cloud-image-uploader
--- a/playbooks/openshift-apps/coreos-ostree-importer.yml
+++ b/playbooks/openshift-apps/coreos-ostree-importer.yml
@ -59,7 +59,7 @@
    secret_file_app: coreos-ostree-importer
    secret_file_secret_name: fedora-messaging-ca
    secret_file_key: "{{ fedora_messaging_ca_file }}"
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
  - role: openshift/secret-file
    secret_file_app: coreos-ostree-importer
    secret_file_secret_name: fedora-messaging-crt
--- a/playbooks/openshift-apps/datanommer.yml
+++ b/playbooks/openshift-apps/datanommer.yml
@ -51,7 +51,7 @@
    secret_file_app: datanommer
    secret_file_secret_name: fedora-messaging-ca
    secret_file_key: cacert.pem
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
  - role: openshift/secret-file
    secret_file_app: datanommer
    secret_file_secret_name: fedora-messaging-crt
--- a/playbooks/openshift-apps/discourse2fedmsg.yml
+++ b/playbooks/openshift-apps/discourse2fedmsg.yml
@ -28,7 +28,7 @@
    secret_file_app: discourse2fedmsg
    secret_file_secret_name: fedora-messaging-ca
    secret_file_key: cacert.pem
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
  - role: openshift/secret-file
    secret_file_app: discourse2fedmsg
    secret_file_secret_name: fedora-messaging-crt
--- a/playbooks/openshift-apps/elections.yml
+++ b/playbooks/openshift-apps/elections.yml
@ -83,7 +83,7 @@
    secret_file_app: elections
    secret_file_secret_name: elections-fedora-messaging-ca
    secret_file_key: elections.ca
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

  - role: openshift/object
    object_app: elections
--- a/playbooks/openshift-apps/fedocal.yml
+++ b/playbooks/openshift-apps/fedocal.yml
@ -46,7 +46,7 @@
    secret_file_app: fedocal
    secret_file_secret_name: fedocal-fedora-messaging-ca
    secret_file_key: fedocal.ca
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

  - role: openshift/object
    object_app: fedocal
--- a/playbooks/openshift-apps/fmn.yml
+++ b/playbooks/openshift-apps/fmn.yml
@ -187,7 +187,7 @@
      secret_file_app: fmn
      secret_file_secret_name: fedora-messaging-ca
      secret_file_key: cacert.pem
-      secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+      secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
    - role: openshift/secret-file
      secret_file_app: fmn
      secret_file_secret_name: fedora-messaging-crt
--- a/playbooks/openshift-apps/greenwave.yml
+++ b/playbooks/openshift-apps/greenwave.yml
@ -49,7 +49,7 @@
    secret_file_app: greenwave
    secret_file_secret_name: greenwave-fedora-messaging-ca
    secret_file_key: greenwave.ca
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

  - role: openshift/object
    object_app: greenwave
--- a/playbooks/openshift-apps/kerneltest.yml
+++ b/playbooks/openshift-apps/kerneltest.yml
@ -56,7 +56,7 @@
    secret_file_app: kerneltest
    secret_file_secret_name: fedora-messaging-ca
    secret_file_key: cacert.pem
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
  - role: openshift/secret-file
    secret_file_app: kerneltest
    secret_file_secret_name: fedora-messaging-crt
--- a/playbooks/openshift-apps/maubot.yml
+++ b/playbooks/openshift-apps/maubot.yml
@ -88,7 +88,7 @@
    secret_file_app: maubot
    secret_file_secret_name: maubot-fedora-messaging-ca
    secret_file_key: maubot.ca
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

  - role: openshift/start-build
    start_build_app: maubot
--- a/playbooks/openshift-apps/mdapi.yml
+++ b/playbooks/openshift-apps/mdapi.yml
@ -57,7 +57,7 @@
    secret_file_app: mdapi
    secret_file_secret_name: mdapi-fedora-messaging-ca
    secret_file_key: mdapi.ca
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

  - role: openshift/object
    object_app: mdapi
--- a/playbooks/openshift-apps/mirrormanager.yml
+++ b/playbooks/openshift-apps/mirrormanager.yml
@ -118,7 +118,7 @@
      secret_file_app: mirrormanager
      secret_file_secret_name: fedora-messaging-ca
      secret_file_key: cacert.pem
-      secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+      secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
    - role: openshift/secret-file
      secret_file_app: mirrormanager
      secret_file_secret_name: fedora-messaging-crt
--- a/playbooks/openshift-apps/noggin-centos.yml
+++ b/playbooks/openshift-apps/noggin-centos.yml
@ -41,7 +41,7 @@
    secret_file_app: noggin-centos
    secret_file_secret_name: fedora-messaging-ca
    secret_file_key: cacert.pem
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
  - role: openshift/secret-file
    secret_file_app: noggin-centos
    secret_file_secret_name: fedora-messaging-crt
--- a/playbooks/openshift-apps/noggin.yml
+++ b/playbooks/openshift-apps/noggin.yml
@ -41,7 +41,7 @@
    secret_file_app: noggin
    secret_file_secret_name: fedora-messaging-ca
    secret_file_key: cacert.pem
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
  - role: openshift/secret-file
    secret_file_app: noggin
    secret_file_secret_name: fedora-messaging-crt
--- a/playbooks/openshift-apps/openscanhub.yml
+++ b/playbooks/openshift-apps/openscanhub.yml
@ -151,7 +151,7 @@
    secret_file_app: openscanhub
    secret_file_secret_name: openscanhub-fedora-messaging-ca
    secret_file_key: fedora-messaging-openscanhub-ca.crt
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
  - role: openshift/secret-file
    secret_file_app: openscanhub
    secret_file_secret_name: openscanhub-fedora-messaging-key
--- a/playbooks/openshift-apps/planet.yml
+++ b/playbooks/openshift-apps/planet.yml
@ -86,7 +86,7 @@
    secret_file_app: planet
    secret_file_secret_name: planet-fedora-messaging-ca
    secret_file_key: cacert.pem
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

  - role: openshift/secret-file
    secret_file_app: planet
--- a/playbooks/openshift-apps/poddlers.yml
+++ b/playbooks/openshift-apps/poddlers.yml
@ -83,7 +83,7 @@
      secret_file_app: poddlers
      secret_file_secret_name: toddlers-fedora-messaging-ca
      secret_file_key: toddlers.ca
-      secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+      secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

    - role: openshift/object
      object_app: poddlers
--- a/playbooks/openshift-apps/release-monitoring.yml
+++ b/playbooks/openshift-apps/release-monitoring.yml
@ -23,7 +23,7 @@
    secret_file_app: release-monitoring
    secret_file_secret_name: release-monitoring-fedora-messaging-ca
    secret_file_key: fedora-messaging-release-monitoring-ca.crt
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
  - role: openshift/secret-file
    secret_file_app: release-monitoring
    secret_file_secret_name: release-monitoring-fedora-messaging-key
--- a/playbooks/openshift-apps/resultsdb-ci-listener.yml
+++ b/playbooks/openshift-apps/resultsdb-ci-listener.yml
@ -58,7 +58,7 @@
      secret_file_app: resultsdb-ci-listener
      secret_file_secret_name: resultsdb-ci-listener-fedora-messaging-ca
      secret_file_key: resultsdb-ci-listener.ca
-      secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+      secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

    - role: openshift/imagestream
      imagestream_app: resultsdb-ci-listener
--- a/playbooks/openshift-apps/resultsdb.yml
+++ b/playbooks/openshift-apps/resultsdb.yml
@ -71,7 +71,7 @@
      secret_file_app: resultsdb
      secret_file_secret_name: resultsdb-fedora-messaging-ca
      secret_file_key: resultsdb.ca
-      secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+      secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

    # backend objects
    - role: openshift/object
--- a/playbooks/openshift-apps/the-new-hotness.yml
+++ b/playbooks/openshift-apps/the-new-hotness.yml
@ -49,7 +49,7 @@
    secret_file_app: the-new-hotness
    secret_file_secret_name: the-new-hotness-fedora-messaging-ca
    secret_file_key: fedora-messaging-the-new-hotness-ca.crt
-    secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+    secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

  - role: openshift/secret-file
    secret_file_app: the-new-hotness
--- a/playbooks/openshift-apps/waiverdb.yml
+++ b/playbooks/openshift-apps/waiverdb.yml
@ -78,7 +78,7 @@
      secret_file_app: waiverdb
      secret_file_secret_name: waiverdb-fedora-messaging-ca
      secret_file_key: waiverdb.ca
-      secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+      secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"

    - role: openshift/object
      object_app: waiverdb
--- a/playbooks/openshift-apps/webhook2fedmsg.yml
+++ b/playbooks/openshift-apps/webhook2fedmsg.yml
@ -53,7 +53,7 @@
      secret_file_app: webhook2fedmsg
      secret_file_secret_name: fedora-messaging-ca
      secret_file_key: cacert.pem
-      secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
+      secret_file_privatefile: "rabbitmq/{{env}}/ca-combined.crt"
    - role: openshift/secret-file
      secret_file_app: webhook2fedmsg
      secret_file_secret_name: fedora-messaging-crt