From dd4e79901e4b569cc0f132417882bb9a4ea5998a Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Mon, 4 Jul 2022 16:07:30 +0200
Subject: [PATCH] Invert jinja delimiter declaration

---
 .../ansible_payload/vars/metacluster.yml      |  5 +++--
 ansible/vars/metacluster.yml                  | 22 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml b/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml
index c45630b..18aa4d0 100644
--- a/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml
@@ -1,2 +1,3 @@
-metacluster:
-  components:
+#jinja2:variable_start_string:'[%' , variable_end_string:'%]'
+
+components:
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index dab798f..ff0dc07 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -1,5 +1,3 @@
-#jinja2:variable_start_string:'[%' , variable_end_string:'%]'
-
 platform:
 
   k3s:
@@ -22,13 +20,13 @@ components:
       version: 1.3.0
       chart: longhorn/longhorn
       parse_logic: cat values.yaml | yq eval '.. | select(has("repository")) | .repository + ":" + .tag'
-      chart_values:
+      chart_values: >-
         defaultSettings:
           defaultDataPath: /mnt/blockstorage
           defaultReplicaCount: 1
         ingress:
           enabled: true
-          host: storage.{{ vapp['metacluster.fqdn'] }}
+          host: storage.[% vapp['metacluster.fqdn'] %]
         persistence:
           defaultClassReplicaCount: 1
 
@@ -37,13 +35,13 @@ components:
       version: 1.9.1  # (= Harbor v2.5.1)
       chart: harbor/harbor
       parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'
-      chart_values:
+      chart_values: >-
         expose:
           ingress:
             hosts:
-              core: registry.{{ vapp['metacluster.fqdn'] }}
-        externalURL: https://registry.{{ vapp['metacluster.fqdn'] }}
-        harborAdminPassword: "{{ vapp['guestinfo.rootpw'] }}"
+              core: registry.[% vapp['metacluster.fqdn'] %]
+        externalURL: https://registry.[% vapp['metacluster.fqdn'] %]
+        harborAdminPassword: "[% vapp['guestinfo.rootpw'] %]"
         notary:
           enabled: false
 
@@ -52,18 +50,18 @@ components:
       version: v5.0.9 # (= Gitea v1.16.8)
       chart: gitea-charts/gitea
       parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | sed '/:/!s/$/:latest/'
-      chart_values:
+      chart_values: >-
         gitea:
           admin:
             username: administrator
-            password: "{{ vapp['guestinfo.rootpw'] }}"
-            email: admin@{{ vapp['metacluster.fqdn'] }}
+            password: "[% vapp['guestinfo.rootpw'] %]"
+            email: admin@[% vapp['metacluster.fqdn'] %]
         image:
           pullPolicy: IfNotPresent
         ingress:
           enabled: true
           hosts:
-            - host: git.{{ vapp['metacluster.fqdn'] }}
+            - host: git.[% vapp['metacluster.fqdn'] %]
               paths:
                 - path: /
                   pathType: Prefix