Browse Source

Fix typo in Containerd configuration (#8206)

pull/8209/head
Pasquale Toscano 3 years ago
committed by GitHub
parent
commit
fe8c843cc8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 11 deletions
  1. 2
      roles/container-engine/containerd/defaults/main.yml
  2. 6
      roles/container-engine/containerd/tasks/facts.yml
  3. 4
      roles/container-engine/containerd/tasks/main.yml

2
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:

6
roles/container-engine/containerd/tasks/facts.yml

@ -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

4
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."

Loading…
Cancel
Save