From fe8c843cc820c05e1e4426c1bba5a5faf536997c Mon Sep 17 00:00:00 2001 From: Pasquale Toscano Date: Fri, 19 Nov 2021 17:40:53 +0100 Subject: [PATCH] Fix typo in Containerd configuration (#8206) --- roles/container-engine/containerd/defaults/main.yml | 2 +- roles/container-engine/containerd/tasks/facts.yml | 6 ------ roles/container-engine/containerd/tasks/main.yml | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 roles/container-engine/containerd/tasks/facts.yml diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index f01f85f38..7ab50b347 100644 --- a/roles/container-engine/containerd/defaults/main.yml +++ b/roles/container-engine/containerd/defaults/main.yml @@ -13,7 +13,7 @@ containerd_runc_runtime: engine: "" root: "" options: - systemCgroup: "true" + systemdCgroup: "{{ containerd_use_systemd_cgroup | ternary('true', 'false') }}" containerd_additional_runtimes: [] # Example for Kata Containers as additional runtime: diff --git a/roles/container-engine/containerd/tasks/facts.yml b/roles/container-engine/containerd/tasks/facts.yml deleted file mode 100644 index 987b78458..000000000 --- a/roles/container-engine/containerd/tasks/facts.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- name: set kubelet_config_extra_args options when cgroupfs is used - set_fact: - containerd_runc_runtime: "{{ containerd_runc_runtime | combine({'options':{'systemCgroup':'false'}}) }}" - when: not containerd_use_systemd_cgroup diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml index 39779e78c..7088f340d 100644 --- a/roles/container-engine/containerd/tasks/main.yml +++ b/roles/container-engine/containerd/tasks/main.yml @@ -1,8 +1,4 @@ --- -- import_tasks: facts.yml - tags: - - facts - - name: Fail containerd setup if distribution is not supported fail: msg: "{{ ansible_distribution }} is not supported by containerd."