From fe7bdf8cda479ac1e35c9fe5dd09532deb434a2a Mon Sep 17 00:00:00 2001 From: Staf Wagemakers Date: Sun, 24 Jan 2021 10:16:20 +0100 Subject: [PATCH] Reorganize the filesystem umount order. * Clean /var/lib/kubelet before /var/lib/rancher/k3s. * Umount the filesystem tree in reverse order, to ensure the root is umounted last. Signed-off-by: Staf Wagemakers --- roles/reset/tasks/main.yml | 2 +- roles/reset/tasks/umount_with_children.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index a8447724..38560c57 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -33,8 +33,8 @@ - "{{ systemd_dir }}/k3s.service" - "{{ systemd_dir }}/k3s-node.service" - /etc/rancher/k3s - - /var/lib/rancher/k3s - /var/lib/kubelet + - /var/lib/rancher/k3s - /usr/local/bin/k3s - name: daemon_reload diff --git a/roles/reset/tasks/umount_with_children.yml b/roles/reset/tasks/umount_with_children.yml index 8bba5963..6e1f4bf0 100644 --- a/roles/reset/tasks/umount_with_children.yml +++ b/roles/reset/tasks/umount_with_children.yml @@ -12,4 +12,4 @@ path: "{{ item }}" state: unmounted with_items: - "{{ get_mounted_filesystems.stdout_lines }}" + "{{ get_mounted_filesystems.stdout_lines | reverse | list }}"