diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml index e2369f9..fb58360 100644 --- a/ansible/roles/metacluster/tasks/components.yml +++ b/ansible/roles/metacluster/tasks/components.yml @@ -6,7 +6,6 @@ - /opt/metacluster/helm-charts - /opt/metacluster/container-images -#- name: Inject values (re: firstboot logic) - name: Add helm repositories kubernetes.core.helm_repository: diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index dbcf544..eebaaaf 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -26,7 +26,7 @@ components: defaultReplicaCount: 1 ingress: enabled: true - host: storage.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} + host: storage.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }} persistence: defaultClassReplicaCount: 1 @@ -39,9 +39,9 @@ components: expose: ingress: hosts: - core: registry.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} - externalURL: https://registry.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} - harborAdminPassword: "{% raw %}{{ vapp['guestinfo.rootpw'] }}{% endraw %}" + core: registry.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }} + externalURL: https://registry.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }} + harborAdminPassword: "{{ '{{' }} vapp['guestinfo.rootpw'] {{ '}}' }}" notary: enabled: false @@ -54,13 +54,13 @@ components: gitea: admin: username: administrator - password: "{% raw %}{{ vapp['guestinfo.rootpw'] }}{% endraw %}" - email: admin@{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} + password: "{{ '{{' }} vapp['guestinfo.rootpw'] {{ '}}' }}" + email: admin@{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }} image: pullPolicy: IfNotPresent ingress: hosts: - - host: git.{% raw %}{{ vapp['metacluster.fqdn'] }}{% endraw %} + - host: git.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }} paths: - path: / pathType: Prefix