From 433a2314878d5f7bf91f9f2a36b8989e5385cc78 Mon Sep 17 00:00:00 2001 From: djpbessems Date: Tue, 29 Nov 2022 13:02:06 +0100 Subject: [PATCH] Improve feedback;Housekeeping;Downgrade K3s version --- .../files/ansible_payload/roles/metacluster/tasks/assets.yml | 2 +- .../files/ansible_payload/roles/users/tasks/main.yml | 2 +- ansible/vars/metacluster.yml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml index 0dcd75e..0dd1b2e 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml +++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml @@ -7,6 +7,6 @@ loop_control: label: "{{ item | basename }}" # Probably should add a task before that ensures K3s node is fully initialized before starting imports; currently K3s goes away briefly during this loop - retries: 3 + retries: 5 delay: 10 until: import_result is not failed diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml index 9c9f605..e2e20a2 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml +++ b/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml @@ -25,7 +25,7 @@ line: 'PasswordAuthentication yes' state: absent loop_control: - label: "{{ '[' + item.line + '] ' + item.state }}" + label: "{{ '[' + item.regex + '] ' + item.state }}" - name: Create dedicated SSH keypair community.crypto.openssh_keypair: diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index 23a7a78..5d7d87a 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -1,7 +1,9 @@ platform: k3s: - version: v1.25.4+k3s1 + # version: v1.25.4+k3s1 + # max supported version by Longhorn is