From 725d4eec0158cbb941769b42c95050f5c54096f0 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 9 May 2019 12:40:30 +0200 Subject: [PATCH] Fipsilon: Fix indentation and stuff and top-define Signed-off-by: Patrick Uiterwijk --- roles/ipsilon/templates/configmap.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/roles/ipsilon/templates/configmap.yml b/roles/ipsilon/templates/configmap.yml index 3b2a6c0662..09e22b43f0 100644 --- a/roles/ipsilon/templates/configmap.yml +++ b/roles/ipsilon/templates/configmap.yml @@ -1,3 +1,4 @@ +{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} --- apiVersion: v1 kind: ConfigMap @@ -77,14 +78,11 @@ data: CoreDumpDirectory /tmp # Ipsilon stuff - {%- macro import_config(filename) %} {% include filename %}{%- endmacro -%} - {{ import_config("ipsilon-httpd.conf.j2") | indent() }} + {{ load_file('ipsilon-httpd.conf.j2') | indent() }} ipsilon.conf: |- - {%- macro import_config(filename) %} {% include filename %}{%- endmacro -%} - {{ import_config("ipsilon.conf") | indent() }} + {{ load_file('ipsilon.conf') | indent() }} configuration.conf: |- - {%- macro import_config(filename) %} {% include filename %}{%- endmacro -%} - {{ import_config("configuration.conf") | indent() }} + {{ load_file('configuration.conf') | indent() }} openidc.static.cfg: |- # TODO openidc.key: |-