diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-08-24 13:42:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 13:42:11 +0100 |
| commit | 4c9ad3ca793e2418a725f2c227108b71db109913 (patch) | |
| tree | 3dfb818a33da2cf65515970586a1723cb8792cb3 /nixos/modules/virtualisation/cri-o.nix | |
| parent | 5c70c5eeaa275aae90e1d3e5b63a6fdcf29bc850 (diff) | |
| parent | e207de63f4f4a8f377eed1f522dc872f338eb26c (diff) | |
| download | nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.gz nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.bz2 nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.lz nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.xz nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.zst nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.zip | |
Merge branch 'master' into nginx-update
Diffstat (limited to 'nixos/modules/virtualisation/cri-o.nix')
| -rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index f267c97b178..9c818eee73b 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}" @@ -109,6 +110,7 @@ in ''; environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; + environment.etc."cni/net.d/99-loopback.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; |