From b0dad1caf755e3c6f949fe16fb7242697f14cded Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Mon, 29 Aug 2022 08:51:33 +0200 Subject: [PATCH] Remove redundant tasks;Fix health check;Add gitea config --- .../files/ansible_payload/roles/metacluster/tasks/git.yml | 2 +- .../ansible_payload/roles/metacluster/tasks/registry.yml | 5 ----- ansible/vars/metacluster.yml | 2 ++ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/git.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/git.yml index f4f2a6a..776ea09 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/git.yml +++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/git.yml @@ -40,7 +40,7 @@ url: https://git.{{ vapp['metacluster.fqdn'] }}/api/healthz method: GET register: api_readycheck - until: api_readycheck.json.status | default(false) | bool + until: api_readycheck.json.status is defined retries: 3 delay: 30 diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml index f82bf04..0b300ce 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml +++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml @@ -28,8 +28,3 @@ ansible.builtin.template: dest: /etc/rancher/k3s/registries.yaml src: registries.j2 - notify: - - Apply manifests - -- name: Trigger handlers - ansible.builtin.meta: flush_handlers diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index c8c26ae..198bb7d 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -118,6 +118,8 @@ components: chart_values: !unsafe | config: offlineMode: true + server: + ROOT_URL: https://git.{{ vapp['metacluster.fqdn'] }}/ gitea: admin: username: administrator