From 87fb44edde4c952ff00a8fcaa9441298485d7629 Mon Sep 17 00:00:00 2001
From: Michal Konečný <mkonecny@redhat.com>
Date: Jun 11 2019 15:28:29 +0000
Subject: caiapi: separate config files


Signed-off-by: Michal Konečný <mkonecny@redhat.com>

---

diff --git a/roles/openshift-apps/accountsystem/templates/caiapi.cfg b/roles/openshift-apps/accountsystem/templates/caiapi.cfg
new file mode 100644
index 0000000..94384be
--- /dev/null
+++ b/roles/openshift-apps/accountsystem/templates/caiapi.cfg
@@ -0,0 +1,12 @@
+OIDC_CLIENT_SECRETS = '/etc/caiapi_oidc.json'
+KRB5_REALM = '{{ ipa_realm }}'
+KRB5_PRINCIPAL = 'CAIAPI/caiapi{{ env_suffix }}.fedoraproject.org'
+KRB5_KEYTAB = '/etc'
+LDAP_SERVER = 'ldaps://ipa01{{ env_suffix }}.fedoraproject.org'
+LDAP_CACERT = '/etc'
+{% if env == "staging" %}
+LDAP_BASE = 'dc=stg,dc=fedoraproject,dc=org'
+{% else %}
+LDAP_BASE = 'dc=fedoraproject,dc=org'
+{% endif %}
+# TODO: Include file for CLIENTS
diff --git a/roles/openshift-apps/accountsystem/templates/configmap_caiapi.yml b/roles/openshift-apps/accountsystem/templates/configmap_caiapi.yml
index f0f06ad..ad45f66 100644
--- a/roles/openshift-apps/accountsystem/templates/configmap_caiapi.yml
+++ b/roles/openshift-apps/accountsystem/templates/configmap_caiapi.yml
@@ -1,3 +1,4 @@
+{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -7,15 +8,4 @@ metadata:
     app: accountsystem
 data:
     caiapi.cfg: |-
-      OIDC_CLIENT_SECRETS = '/etc/caiapi_oidc.json'
-      KRB5_REALM = '{{ ipa_realm }}'
-      KRB5_PRINCIPAL = 'CAIAPI/caiapi{{ env_suffix }}.fedoraproject.org'
-      KRB5_KEYTAB = '/etc'
-      LDAP_SERVER = 'ldaps://ipa01{{ env_suffix }}.fedoraproject.org'
-      LDAP_CACERT = '/etc'
-{% if env == "staging" %}
-      LDAP_BASE = 'dc=stg,dc=fedoraproject,dc=org'
-{% else %}
-      LDAP_BASE = 'dc=fedoraproject,dc=org'
-{% endif %}
-      # TODO: Include file for CLIENTS
+      {{ load_file('caiapi.cfg') | indent }}