From 7358fd1f06bd78f145b7e9804f691ddd496df7a0 Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Wed, 14 Aug 2019 11:30:02 +0800
Subject: [PATCH] message-tagging-service: use fedora-infra krb5.conf template
 and install koji conf into proper place

Signed-off-by: Chenxiong Qi <cqi@redhat.com>
---
 .../templates/configmap.yml                   | 22 ++-----------------
 .../templates/deployment.yml                  | 17 +++++++++-----
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/roles/openshift-apps/message-tagging-service/templates/configmap.yml b/roles/openshift-apps/message-tagging-service/templates/configmap.yml
index 1f88294011..10a88caf69 100644
--- a/roles/openshift-apps/message-tagging-service/templates/configmap.yml
+++ b/roles/openshift-apps/message-tagging-service/templates/configmap.yml
@@ -130,26 +130,8 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "fedoraproject-kerberos-auth-config"
+  name: "krb5-conf"
   labels:
     app: "mts"
 data:
-{% if env == 'staging' %}
-  stg_fedoraproject_org: |-
-    [realms]
-      STG.FEDORAPROJECT.ORG = {
-        kdc = https://id.stg.fedoraproject.org/KdcProxy
-      }
-    [domain_realm]
-      .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG
-      stg.fedoraproject.org = STG.FEDORAPROJECT.ORG
-{% else %}
-  fedoraproject_org: |-
-    [realms]
-      FEDORAPROJECT.ORG = {
-        kdc = https://id.fedoraproject.org/KdcProxy
-      }
-    [domain_realm]
-      .fedoraproject.org = FEDORAPROJECT.ORG
-      fedoraproject.org = FEDORAPROJECT.ORG
-{% endif %}
+  {{ lookup('template', roles_path + '/base/templates/krb5.conf.j2') | indent }}
diff --git a/roles/openshift-apps/message-tagging-service/templates/deployment.yml b/roles/openshift-apps/message-tagging-service/templates/deployment.yml
index 05021cec05..1ee3b0aa58 100644
--- a/roles/openshift-apps/message-tagging-service/templates/deployment.yml
+++ b/roles/openshift-apps/message-tagging-service/templates/deployment.yml
@@ -29,10 +29,17 @@ spec:
           mountPath: /etc/fedmsg.d
           readOnly: true
         - name: "koji-conf"
-          mountPath: /etc/koji.conf.d
+{% if env == 'staging' %}
+          mountPath: /etc/koji.conf.d/stg.conf
+          subPath: stg.conf
+{% else %}
+          mountPath: /etc/koji.conf
+          subPath: koji.conf
+{% endif %}
           readOnly: true
-        - name: "fedoraproject-kerberos-auth-config"
-          mountPath: /etc/krb5.conf.d/
+        - name: "krb5-conf"
+          mountPath: /etc/krb5.conf
+          subPath: krb5.conf
           readOnly: true
         - name: keytab
           mountPath: /etc/krb5.keytab
@@ -67,9 +74,9 @@ spec:
       - name: "koji-conf"
         configMap:
           name: "koji-conf"
-      - name: "fedoraproject-kerberos-auth-config"
+      - name: "krb5-conf"
         configMap:
-          name: "fedoraproject-kerberos-auth-config"
+          name: "krb5-conf"
       - name: keytab
         secret:
           secretName: keytab