diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2 index c02ea2034..6ab414dc0 100644 --- a/roles/container-engine/containerd/templates/config.toml.j2 +++ b/roles/container-engine/containerd/templates/config.toml.j2 @@ -22,15 +22,7 @@ oom_score = {{ containerd_oom_score }} default_runtime_name = "{{ containerd_default_runtime | default('runc') }}" snapshotter = "{{ containerd_snapshotter | default('overlayfs') }}" [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ containerd_runc_runtime.name }}] - runtime_type = "{{ containerd_runc_runtime.type }}" - runtime_engine = "{{ containerd_runc_runtime.engine}}" - runtime_root = "{{ containerd_runc_runtime.root }}" - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ containerd_runc_runtime.name }}.options] -{% for key, value in containerd_runc_runtime.options.items() %} - {{ key }} = {{ value }} -{% endfor %} -{% for runtime in containerd_additional_runtimes %} +{% for runtime in [containerd_runc_runtime] + containerd_additional_runtimes %} [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ runtime.name }}] runtime_type = "{{ runtime.type }}" runtime_engine = "{{ runtime.engine }}"