diff options
| author | Sascha Grunert <sgrunert@suse.com> | 2020-08-16 12:34:51 +0200 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-08-21 12:09:20 +1000 |
| commit | 71dd85bffaf717f80873ab9428aac871a9ba1a0c (patch) | |
| tree | b044c5407564e3d31996123fea1801dda59ea0be /nixos | |
| parent | 22dcc4e08a1a5d33cedf6ae567a8b2955c56d3ce (diff) | |
| download | nixpkgs-71dd85bffaf717f80873ab9428aac871a9ba1a0c.tar nixpkgs-71dd85bffaf717f80873ab9428aac871a9ba1a0c.tar.gz nixpkgs-71dd85bffaf717f80873ab9428aac871a9ba1a0c.tar.bz2 nixpkgs-71dd85bffaf717f80873ab9428aac871a9ba1a0c.tar.lz nixpkgs-71dd85bffaf717f80873ab9428aac871a9ba1a0c.tar.xz nixpkgs-71dd85bffaf717f80873ab9428aac871a9ba1a0c.tar.zst nixpkgs-71dd85bffaf717f80873ab9428aac871a9ba1a0c.zip | |
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 <sgrunert@suse.com>
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 3 |
1 files changed, 2 insertions, 1 deletions
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}" |