From 7ae8318f59b0494495086182311d853ca5d21d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Tue, 22 Nov 2022 18:35:35 +0100
Subject: [PATCH] FMN: mount the ipa directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 .../fmn/templates/deploymentconfig.yml        | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
index 6ee5230aee..b40411bd4e 100644
--- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
@@ -99,17 +99,20 @@ spec:
             - name: etc-fmn
               mountPath: "/etc/fmn"
               readOnly: true
+            - name: ipa-config-volume
+              mountPath: /etc/ipa
+              readOnly: true
             - name: keytab-volume
               mountPath: /etc/keytabs
               readOnly: true
-            - name: rabbitmq-ca-volume
-              mountPath: /etc/pki/rabbitmq/ca
+            - name: fedora-messaging-ca-volume
+              mountPath: /etc/pki/fedora-messaging/ca
               readOnly: true
-            - name: rabbitmq-key-volume
-              mountPath: /etc/pki/rabbitmq/key
+            - name: fedora-messaging-key-volume
+              mountPath: /etc/pki/fedora-messaging/key
               readOnly: true
-            - name: rabbitmq-crt-volume
-              mountPath: /etc/pki/rabbitmq/crt
+            - name: fedora-messaging-crt-volume
+              mountPath: /etc/pki/fedora-messaging/crt
               readOnly: true
 
           env:
@@ -142,18 +145,21 @@ spec:
         - name: etc-fmn
           configMap:
             name: fmn
+        - name: ipa-config-volume
+          configMap:
+            name: ipa-client-config
         - name: keytab-volume
           secret:
             secretName: keytab
-        - name: rabbitmq-ca-volume
-          mountPath: /etc/pki/rabbitmq/ca
-          readOnly: true
-        - name: rabbitmq-key-volume
-          mountPath: /etc/pki/rabbitmq/key
-          readOnly: true
-        - name: rabbitmq-crt-volume
-          mountPath: /etc/pki/rabbitmq/crt
-          readOnly: true
+        - name: fedora-messaging-ca-volume
+          secret:
+            secretName: fedora-messaging-ca
+        - name: fedora-messaging-key-volume
+          secret:
+            secretName: fedora-messaging-key
+        - name: fedora-messaging-crt-volume
+          secret:
+            secretName: fedora-messaging-crt
   triggers:
     - type: ImageChange
       imageChangeParams:
@@ -201,6 +207,9 @@ spec:
             - name: etc-fmn
               mountPath: "/etc/fmn"
               readOnly: true
+            - name: ipa-config-volume
+              mountPath: /etc/ipa
+              readOnly: true
             - name: keytab-volume
               mountPath: /etc/keytabs
               readOnly: true
@@ -224,6 +233,9 @@ spec:
         - name: etc-fmn
           configMap:
             name: fmn
+        - name: ipa-config-volume
+          configMap:
+            name: ipa-client-config
         - name: keytab-volume
           secret:
             secretName: keytab