From 5043517cfb78d644aaeefb43de36fd3b6f484c8c Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Tue, 15 Mar 2022 22:47:48 +0200
Subject: [PATCH] [containerd] avoid cleanup of /usr/bin on ostree
distributions (#8624)
---
roles/container-engine/containerd/tasks/main.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml
index 1c556bdf3..8facf61aa 100644
--- a/roles/container-engine/containerd/tasks/main.yml
+++ b/roles/container-engine/containerd/tasks/main.yml
@@ -45,7 +45,9 @@
file:
path: "/usr/bin/{{ item }}"
state: absent
- when: containerd_bin_dir != "/usr/bin"
+ when:
+ - containerd_bin_dir != "/usr/bin"
+ - not (is_ostree or (ansible_distribution == "Flatcar Container Linux by Kinvolk") or (ansible_distribution == "Flatcar"))
ignore_errors: true # noqa ignore-errors
with_items:
- containerd
--
GitLab