summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorUli Baum <xeji@cat3.de>2018-07-11 00:10:42 +0200
committerUli Baum <xeji@cat3.de>2018-07-11 00:27:06 +0200
commit7ac794f8780f4c35221763de6a425a07004515f2 (patch)
treec2b8628af2916716beb00a9fab085f3965c1192f /nixos
parent3c9f3a867efe49ddb9d3254a1efada7c0a35a185 (diff)
downloadnixlib-7ac794f8780f4c35221763de6a425a07004515f2.tar
nixlib-7ac794f8780f4c35221763de6a425a07004515f2.tar.gz
nixlib-7ac794f8780f4c35221763de6a425a07004515f2.tar.bz2
nixlib-7ac794f8780f4c35221763de6a425a07004515f2.tar.lz
nixlib-7ac794f8780f4c35221763de6a425a07004515f2.tar.xz
nixlib-7ac794f8780f4c35221763de6a425a07004515f2.tar.zst
nixlib-7ac794f8780f4c35221763de6a425a07004515f2.zip
nixos/tests/taskserver: fix eval
Since IP address options were changed for 18.03, eval has failed with:
"The option `networking.interfaces.eth1.subnetMask' is used but not defined."
although this option is not used at all in nixos anymore.

The misleading error message seems to be generated from evaluating warnings
for `mkRemovedOptionModule ["subnetMask"]` which apparently broke here
when this test inherited network.interfaces from one VM config to another.

Cc: @aszlig
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/taskserver.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix
index 75be97a507d0..d3f93dd18375 100644
--- a/nixos/tests/taskserver.nix
+++ b/nixos/tests/taskserver.nix
@@ -82,8 +82,9 @@ in {
       # This is to avoid assigning a different network address to the new
       # generation.
       networking = lib.mapAttrs (lib.const lib.mkForce) {
+        interfaces.eth1.ipv4 = nodes.server.config.networking.interfaces.eth1.ipv4;
         inherit (nodes.server.config.networking)
-          hostName interfaces primaryIPAddress extraHosts;
+          hostName primaryIPAddress extraHosts;
       };
     };