From 2bda20726e98a27f2df094f42aa1c9dd7f730370 Mon Sep 17 00:00:00 2001
From: Dustin Frisch <fooker@lab.sh>
Date: Thu, 9 Nov 2023 13:53:13 +0100
Subject: [PATCH] fix netinstall

---
 machines/node/default.nix | 4 ++++
 modules/netinstall.nix    | 4 +---
 modules/node.nix          | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/machines/node/default.nix b/machines/node/default.nix
index b011373..2ec01da 100644
--- a/machines/node/default.nix
+++ b/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 = [
diff --git a/modules/netinstall.nix b/modules/netinstall.nix
index 5e582e7..1317409 100644
--- a/modules/netinstall.nix
+++ b/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";
       }
     ];
diff --git a/modules/node.nix b/modules/node.nix
index 4543eb9..b40d018 100644
--- a/modules/node.nix
+++ b/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" ];
   };
 }