diff --git a/tasks/main.yml b/tasks/main.yml index 410d8d4..15e1b1a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -100,7 +100,8 @@ - "01-cgroup-manager.conf" - "01-log-level.conf" - "01-metrics.conf" - notify: Restart containerd + - "01-crio-network.conf" + notify: Restart cri-o - name: Enable cri-o on boot service: diff --git a/templates/etc/crio/crio.conf.d/01-crio-network.conf.j2 b/templates/etc/crio/crio.conf.d/01-crio-network.conf.j2 new file mode 100644 index 0000000..58008cb --- /dev/null +++ b/templates/etc/crio/crio.conf.d/01-crio-network.conf.j2 @@ -0,0 +1,16 @@ +# The crio.network table containers settings pertaining to the management of +# CNI plugins. +[crio.network] + +# The default CNI network name to be selected. If not set or "", then +# CRI-O will pick-up the first one found in network_dir. +# cni_default_network = "" + +# Path to the directory where CNI configuration files are located. +network_dir = "/etc/cni/net.d/" + +# Paths to directories where CNI plugin binaries are located. +plugin_dirs = [ + "/opt/cni/bin", +] + diff --git a/templates/etc/crio/crio.conf.d/01-crio-runtime.conf.j2 b/templates/etc/crio/crio.conf.d/01-crio-runtime.conf.j2 index 4de599f..fd2f749 100644 --- a/templates/etc/crio/crio.conf.d/01-crio-runtime.conf.j2 +++ b/templates/etc/crio/crio.conf.d/01-crio-runtime.conf.j2 @@ -1,2 +1,3 @@ [crio.runtime] -conmon = "/usr/bin/conmon" \ No newline at end of file +conmon = "/usr/bin/conmon" +manage_ns_lifecycle = true