From 9f052702e599f47d7bd9eaa06347b714c1205515 Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Thu, 2 Dec 2021 17:51:33 +0200
Subject: [PATCH] containerd: add support for suse distributions (#8261)
---
.../containerd/molecule/default/molecule.yml | 8 ++++++++
roles/container-engine/containerd/tasks/main.yml | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/roles/container-engine/containerd/molecule/default/molecule.yml b/roles/container-engine/containerd/molecule/default/molecule.yml
index f285da1cb..fb2cb9f9d 100644
--- a/roles/container-engine/containerd/molecule/default/molecule.yml
+++ b/roles/container-engine/containerd/molecule/default/molecule.yml
@@ -31,6 +31,14 @@ platforms:
- kube_control_plane
- kube_node
- k8s_cluster
+ - name: opensuse
+ box: opensuse/Leap-15.2.x86_64
+ cpus: 1
+ memory: 1024
+ groups:
+ - kube_control_plane
+ - kube_node
+ - k8s_cluster
provisioner:
name: ansible
env:
diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml
index 7088f340d..4573e0d17 100644
--- a/roles/container-engine/containerd/tasks/main.yml
+++ b/roles/container-engine/containerd/tasks/main.yml
@@ -3,7 +3,7 @@
fail:
msg: "{{ ansible_distribution }} is not supported by containerd."
when:
- - not ansible_distribution in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Rocky", "Amazon", "Flatcar", "Flatcar Container Linux by Kinvolk"]
+ - ansible_distribution not in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Rocky", "Amazon", "Flatcar", "Flatcar Container Linux by Kinvolk", "Suse", "openSUSE Leap", "openSUSE Tumbleweed"]
- name: disable unified_cgroup_hierarchy in Fedora 31+
command: grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0"
--
GitLab