fix netinstall

machines/node/default.nix

@@ -15,6 +15,8 @@ with lib;
   deployment = {
     targetHost = "10.32.47.${toString (100 + id)}";
     targetUser = "root";
+
+    tags = [ "node" ];
   };
 
   hpc.node = {
@@ -22,6 +24,8 @@ with lib;
     inherit id;
   };
 
+  hpc.netinstall.enable = true;
+
   networking.hostName = config.hpc.node.name;
 
   networking.timeServers = [

modules/netinstall.nix

@@ -8,11 +8,9 @@ with lib;
   };
 
   config = mkIf config.hpc.netinstall.enable {
-    deployment.tags = [ "netinstall" ];
-
     assertions = [
       {
-        assertion = elem "data" config.hpc.dhcp.reservations;
+        assertion = hasAttr "data" config.hpc.dhcp.reservations;
         message = "NetInstall needs DHCP reservation in data network";
       }
     ];

modules/node.nix

@@ -24,7 +24,5 @@ with lib;
 
   config = mkIf config.hpc.node.enable {
     hpc.node.name = "node-${fixedWidthNumber 2 config.hpc.node.id}";
-
-    deployment.tags = [ "node" ];
   };
 }