From adf9345c8356835aedd9a3322babdb1dda29dd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 19 Aug 2020 18:10:26 +0200 Subject: [PATCH] Noggin: try again to fix the configmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- playbooks/openshift-apps/noggin.yml | 2 +- roles/openshift-apps/noggin/templates/configmap.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index 17be65a9d5..6fc10c62d3 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/playbooks/openshift-apps/noggin.yml @@ -18,7 +18,7 @@ register: ipa_ca_cert_var - name: Register the IPA CA cert in a fact set_fact: - ipa_ca_cert: "{{ ipa_ca_cert_var.content }}" + ipa_ca_cert: "{{ ipa_ca_cert_var.content | b64decode }}" roles: # RabbitMQ is not redeployed in staging yet diff --git a/roles/openshift-apps/noggin/templates/configmap.yml b/roles/openshift-apps/noggin/templates/configmap.yml index 16ce996f8f..b8049c6a3a 100644 --- a/roles/openshift-apps/noggin/templates/configmap.yml +++ b/roles/openshift-apps/noggin/templates/configmap.yml @@ -40,8 +40,8 @@ items: name: ipa-config data: ldap.conf: |- - {{ load_file('ipa-ldap.conf') | indent(6) }} + {{ load_file('ipa-ldap.conf') | indent(6) }} default.conf: |- - {{ load_file('ipa-default.conf') | indent(6) }} + {{ load_file('ipa-default.conf') | indent(6) }} ca.crt: |- - {{ ipa_ca_cert | indent(6) }} + {{ ipa_ca_cert | indent(6) }}