From 2af8ad94c998cd33bcc81b8b4a8b3e16579d2623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Tue, 1 Sep 2020 22:26:21 +0200
Subject: [PATCH] FASJSON: get the host keytab
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 playbooks/openshift-apps/fasjson.yml               | 12 ++++++------
 .../fasjson/templates/deploymentconfig.yml         | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml
index e9aa0f2ec6..2e1abdbed5 100644
--- a/playbooks/openshift-apps/fasjson.yml
+++ b/playbooks/openshift-apps/fasjson.yml
@@ -52,12 +52,12 @@
     # The ipa-ldap delegation target is declared during IPA installation
 
   # Keytabs
-  #- role: openshift/keytab
-  #  app: fasjson
-  #  key: host
-  #  secret_name: fasjson-keytab-host
-  #  service: host
-  #  host: "fasjson{{ env_suffix }}.fedoraproject.org"
+  - role: openshift/keytab
+    app: fasjson
+    key: host
+    secret_name: fasjson-keytab-host
+    service: host
+    host: "fasjson{{ env_suffix }}.fedoraproject.org"
   - role: openshift/keytab
     app: fasjson
     key: http
diff --git a/roles/openshift-apps/fasjson/templates/deploymentconfig.yml b/roles/openshift-apps/fasjson/templates/deploymentconfig.yml
index 2d46eb7d43..922d43ecb6 100644
--- a/roles/openshift-apps/fasjson/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fasjson/templates/deploymentconfig.yml
@@ -31,10 +31,10 @@ spec:
         ports:
         - containerPort: 8080
         volumeMounts:
-        #- name: keytab-host-volume
-        #  mountPath: /etc/keytabs/host
-        #  subPath: host
-        #  readOnly: true
+        - name: keytab-host-volume
+          mountPath: /etc/keytabs/host
+          subPath: host
+          readOnly: true
         - name: keytab-http-volume
           mountPath: /etc/keytabs/http
           subPath: http
@@ -68,9 +68,9 @@ spec:
       - name: fasjson-config-volume
         configMap:
           name: fasjson-config
-      # - name: keytab-host-volume
-      #   secret:
-      #     secretName: fasjson-keytab-host
+      - name: keytab-host-volume
+        secret:
+          secretName: fasjson-keytab-host
       - name: keytab-http-volume
         secret:
           secretName: fasjson-keytab-http