From 5e359beda97d864a40d8db8d552e2fe0389e8043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 16 Sep 2020 15:27:50 +0200 Subject: [PATCH] Ipsilon: deploy the ldap config file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- playbooks/openshift-apps/ipsilon.yml | 3 +++ roles/openshift-apps/ipsilon/templates/buildconfig.yml | 2 ++ roles/openshift-apps/ipsilon/templates/deploymentconfig.yml | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/playbooks/openshift-apps/ipsilon.yml b/playbooks/openshift-apps/ipsilon.yml index 5167224372..d2cf103af8 100644 --- a/playbooks/openshift-apps/ipsilon.yml +++ b/playbooks/openshift-apps/ipsilon.yml @@ -33,6 +33,9 @@ service: HTTP host: "id{{ env_suffix }}.fedoraproject.org" + - role: openshift/ipa-client + app: ipsilon + - role: openshift/imagestream app: ipsilon imagename: ipsilon diff --git a/roles/openshift-apps/ipsilon/templates/buildconfig.yml b/roles/openshift-apps/ipsilon/templates/buildconfig.yml index 7544930693..e7d4bc5340 100644 --- a/roles/openshift-apps/ipsilon/templates/buildconfig.yml +++ b/roles/openshift-apps/ipsilon/templates/buildconfig.yml @@ -45,6 +45,8 @@ spec: # Set up krb5 RUN rm -f /etc/krb5.conf && ln -sf /etc/ipsilon/krb5.conf /etc/krb5.conf + # Set up LDAP + RUN rm -f /etc/openldap/ldap.conf && ln -sf /etc/ipa/ldap.conf /etc/openldap/ldap.conf RUN ln -s /etc/ipsilon/ipsilon.conf /var/lib/ipsilon/ipsilon.conf diff --git a/roles/openshift-apps/ipsilon/templates/deploymentconfig.yml b/roles/openshift-apps/ipsilon/templates/deploymentconfig.yml index 5af1090c62..3e2ad156d9 100644 --- a/roles/openshift-apps/ipsilon/templates/deploymentconfig.yml +++ b/roles/openshift-apps/ipsilon/templates/deploymentconfig.yml @@ -37,6 +37,9 @@ spec: - name: config-volume mountPath: /etc/ipsilon readOnly: true + - name: ipa-config-volume + mountPath: /etc/ipa + readOnly: true - name: keytab-volume mountPath: /etc/keytabs readOnly: true @@ -61,6 +64,9 @@ spec: - name: keytab-volume secret: secretName: ipsilon-keytab + - name: ipa-config-volume + configMap: + name: ipa-client-config - name: httpdir-volume emptyDir: {} triggers: