diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index 4afe873..2a2d9cf 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -1,3 +1,5 @@ +#jinja2:variable_start_string:'[%' , variable_end_string:'%]' + platform: k3s: @@ -20,13 +22,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 @@ -35,13 +37,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 @@ -50,18 +52,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