From a86d9bd8e8d922f33984623edea15057fbaff23d Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 17 Mar 2022 16:49:20 +0300 Subject: [PATCH] do not remove package in validate container engine role when Fedora CoreOS distr (#8626) --- .../validate-container-engine/tasks/main.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/roles/container-engine/validate-container-engine/tasks/main.yml b/roles/container-engine/validate-container-engine/tasks/main.yml index ad9e92feb..0cd7d3623 100644 --- a/roles/container-engine/validate-container-engine/tasks/main.yml +++ b/roles/container-engine/validate-container-engine/tasks/main.yml @@ -1,4 +1,16 @@ --- +- name: validate-container-engine | check if fedora coreos + stat: + path: /run/ostree-booted + get_attributes: no + get_checksum: no + get_mime: no + register: ostree + +- name: validate-container-engine | set is_ostree + set_fact: + is_ostree: "{{ ostree.stat.exists }}" + - name: Ensure kubelet systemd unit exists stat: path: "/etc/systemd/system/kubelet.service" @@ -64,6 +76,7 @@ tags: - reset_containerd when: + - not (is_ostree or (ansible_distribution == "Flatcar Container Linux by Kinvolk") or (ansible_distribution == "Flatcar")) - container_manager != "containerd" - docker_installed.matched == 0 - containerd_installed.matched > 0 @@ -89,6 +102,7 @@ tags: - reset_docker when: + - not (is_ostree or (ansible_distribution == "Flatcar Container Linux by Kinvolk") or (ansible_distribution == "Flatcar")) - container_manager != "docker" - docker_installed.matched > 0 @@ -113,5 +127,6 @@ tags: - reset_crio when: + - not (is_ostree or (ansible_distribution == "Flatcar Container Linux by Kinvolk") or (ansible_distribution == "Flatcar")) - container_manager != "crio" - crio_installed.matched > 0