Remove unsupported command module "warn" parameter (#218)

* Remove unsupported command module "warn" parameter As of ansible-core 2.14.0, the builtin command module no longer has a "warn" parameter. Using it causes a fatal error that stops playbook completion. Signed-off-by: Brian Brookman <[email protected]> Signed-off-by: Derek Nola <[email protected]> * Relax yamllint rules on spaces inside braces Signed-off-by: Derek Nola <[email protected]> * Fix lint Signed-off-by: Derek Nola <[email protected]> --------- Signed-off-by: Brian Brookman <[email protected]> Signed-off-by: Derek Nola <[email protected]> Co-authored-by: Julien DOCHE <[email protected]> Co-authored-by: Derek Nola <[email protected]>
k3s-io · Nov 7, 2023 · 8b5b6e2 · 8b5b6e2
1 parent 7ec3049
commit 8b5b6e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.yamllint b/.yamllint
@@ -7,3 +7,5 @@ rules:
     level: warning
   truthy:
     allowed-values: ['true', 'false', 'yes', 'no']
+  braces:
+    max-spaces-inside: 1
diff --git a/roles/k3s/master/defaults/main.yml b/roles/k3s/master/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 ansible_user: root
 k3s_server_location: /var/lib/rancher/k3s
-server_init_args: >-
+k3s_server_init_args: >-
   {% if groups['master'] | length > 1 %}
     {% if ansible_host == hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) %}
       --cluster-init

diff --git a/roles/k3s/master/tasks/main.yml b/roles/k3s/master/tasks/main.yml
@@ -6,21 +6,17 @@
   failed_when: false
 
 - name: Clean previous runs of k3s-init
-  ansible.builtin.command: systemctl reset-failed k3s-init
+  ansible.builtin.command: systemctl reset-failed k3s-init  # noqa: command-instead-of-module
   failed_when: false
   changed_when: false
-  args:
-    warn: false  # The ansible systemd module does not support reset-failed
 
 - name: Init cluster inside the transient k3s-init service
   ansible.builtin.command:
     cmd: "systemd-run -p RestartSec=2 \
                       -p Restart=on-failure \
                       --unit=k3s-init \
-                      k3s server {{ server_init_args }}"
+                      k3s server {{ k3s_server_init_args }}"
     creates: "{{ systemd_dir }}/k3s.service"
-  args:
-    warn: false  # The ansible systemd module does not support transient units
 
 - name: Verification
   block:
@@ -98,7 +94,7 @@
     owner: "{{ ansible_user }}"
     mode: "u=rw,g=,o="
 
-- name: Configure kubectl cluster to https://{{ apiserver_endpoint }}:{{ apiserver_port | default(6443) }}
+- name: Configure kubectl cluster to server endpoint
   ansible.builtin.command: >-
     /usr/local/bin/k3s kubectl config set-cluster default
       --server=https://{{ apiserver_endpoint }}:{{ apiserver_port | default(6443) }}