Merge remote-tracking branch 'upstream/master'

noahsbwilliams · Apr 28, 2021 · 1db9c87 · 1db9c87
2 parents 14bc5f2 + ef8d3a1
commit 1db9c87
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,7 +22,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint
+        run: pip3 install yamllint ansible-lint ansible
 
       - name: Run yamllint.
         run: yamllint .

diff --git a/roles/k3s/master/tasks/main.yml b/roles/k3s/master/tasks/main.yml
@@ -7,7 +7,7 @@
     dest: "{{ systemd_dir }}/k3s.service"
     owner: root
     group: root
-    mode: 0755
+    mode: 0644
 
 - name: Enable and check K3s service
   systemd:

diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
@@ -30,12 +30,12 @@
     name: "{{ item }}"
     state: absent
   with_items:
+    - /usr/local/bin/k3s
     - "{{ systemd_dir }}/k3s.service"
     - "{{ systemd_dir }}/k3s-node.service"
     - /etc/rancher/k3s
-    - /var/lib/rancher/k3s
     - /var/lib/kubelet
-    - /usr/local/bin/k3s
+    - /var/lib/rancher/k3s
 
 - name: daemon_reload
   systemd:

diff --git a/roles/reset/tasks/umount_with_children.yml b/roles/reset/tasks/umount_with_children.yml
@@ -6,10 +6,11 @@
     executable: /bin/bash
   failed_when: false
   changed_when: get_mounted_filesystems.stdout | length > 0
+  check_mode: false
 
 - name: Umount filesystem
   mount:
     path: "{{ item }}"
     state: unmounted
   with_items:
-    "{{ get_mounted_filesystems.stdout_lines }}"
+    "{{ get_mounted_filesystems.stdout_lines | reverse | list }}"