From cbd3a83a06a07324b20221338ae2576fe92fb0ec Mon Sep 17 00:00:00 2001
From: Noam <noama@nvidia.com>
Date: Tue, 14 Nov 2023 18:20:19 +0200
Subject: [PATCH] add option to enable cdi for containerd (#10603)
---
roles/container-engine/containerd/defaults/main.yml | 3 +++
roles/container-engine/containerd/templates/config.toml.j2 | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
index da51a4cd0..2fb4afe90 100644
--- a/roles/container-engine/containerd/defaults/main.yml
+++ b/roles/container-engine/containerd/defaults/main.yml
@@ -105,3 +105,6 @@ containerd_supported_distributions:
- "UnionTech"
- "UniontechOS"
- "openEuler"
+
+# Enable container device interface
+enable_cdi: false
diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2
index cc43a3df6..d1bb4abfb 100644
--- a/roles/container-engine/containerd/templates/config.toml.j2
+++ b/roles/container-engine/containerd/templates/config.toml.j2
@@ -20,6 +20,10 @@ oom_score = {{ containerd_oom_score }}
max_container_log_line_size = {{ containerd_max_container_log_line_size }}
enable_unprivileged_ports = {{ containerd_enable_unprivileged_ports | default(false) | lower }}
enable_unprivileged_icmp = {{ containerd_enable_unprivileged_icmp | default(false) | lower }}
+{% if enable_cdi %}
+ enable_cdi = true
+ cdi_spec_dirs = ["/etc/cdi", "/var/run/cdi"]
+{% endif %}
[plugins."io.containerd.grpc.v1.cri".containerd]
default_runtime_name = "{{ containerd_default_runtime | default('runc') }}"
snapshotter = "{{ containerd_snapshotter | default('overlayfs') }}"
--
GitLab