From 71dd85bffaf717f80873ab9428aac871a9ba1a0c Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Sun, 16 Aug 2020 12:34:51 +0200 Subject: cri-o: add pinns path and witch to crio.conf.d config style This adds the pinns path to the configuration let CRI-O start properly. We also change the configuration to the new drop-in syntax. Signed-off-by: Sascha Grunert --- nixos/modules/virtualisation/cri-o.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index f267c97b178..f8a75d3faa5 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -85,7 +85,7 @@ in environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; - environment.etc."crio/crio.conf".text = '' + environment.etc."crio/crio.conf.d/00-default.conf".text = '' [crio] storage_driver = "${cfg.storageDriver}" @@ -100,6 +100,7 @@ in cgroup_manager = "systemd" log_level = "${cfg.logLevel}" manage_ns_lifecycle = true + pinns_path = "${cfg.package}/bin/pinns" ${optionalString (cfg.runtime != null) '' default_runtime = "${cfg.runtime}" -- cgit 1.4.1