From c24782765413fceb7aad9c004a9b1ba19da9c573 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 17 Oct 2021 23:56:52 +0200 Subject: nixosTest: Provide system.build.networkConfig --- nixos/lib/build-vms.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'nixos/lib/build-vms.nix') diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 0f0bdb4a86c..05d9ce89dbd 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -68,9 +68,8 @@ rec { prefixLength = 24; } ]; }); - in - { key = "ip-address"; - config = + + networkConfig = { networking.hostName = mkDefault m.fst; networking.interfaces = listToAttrs interfaces; @@ -96,7 +95,15 @@ rec { in flip concatMap interfacesNumbered ({ fst, snd }: qemu-common.qemuNICFlags snd fst m.snd); }; - } + + in + { key = "ip-address"; + config = networkConfig // { + # Expose the networkConfig items for tests like nixops + # that need to recreate the network config. + system.build.networkConfig = networkConfig; + }; + } ) (getAttr m.fst nodes) ] ); -- cgit 1.4.1