fix: fix independent slurmdbd setup

modules/hpc/slurm.nix

@@ -85,6 +85,18 @@ let
       };
 
   slurmServer = {
+    services.slurm = {
+      server.enable = true;
+      # extraConfig = ''
+      #   MailDomain=itpartner.no
+      #   MailProg=${pkgs.ssmtp}/bin/ssmtp
+      # '';
+    };
+
+    networking.firewall.allowedTCPPorts = [ 6817 ];
+  };
+
+  dbdServer = {
     services.mysql = {
       enable = true;
       package = pkgs.mariadb;
@@ -101,24 +113,14 @@ let
       ];
     };
 
-    services.slurm = {
-      server.enable = true;
-      # extraConfig = ''
-      #   MailDomain=itpartner.no
-      #   MailProg=${pkgs.ssmtp}/bin/ssmtp
-      # '';
-    };
-
-    networking.firewall.allowedTCPPorts = [ 6817 ];
-  };
-
-  dbdServer = {
     services.slurm.dbdserver = {
       enable = true;
       dbdHost = cfg.dbdHost;
       extraConfig = cfg.dbdExtraConfig;
       # storagePass  = cfg.storagePass;
     };
+
+    networking.firewall.allowedTCPPorts = [ 6819 ];
   };
 
   slurmClient = {
@@ -205,7 +207,7 @@ in
 
     clusterName = mkOption {
       type = types.str;
-      default = null;
+      default = "default";
     };
 
     pkey = mkOption {
@@ -215,7 +217,7 @@ in
 
     controlMachine = mkOption {
       type = types.str;
-      default = null;
+      default = "localhost";
     };
 
     dbdHost = mkOption {
@@ -270,7 +272,7 @@ in
 
     mailDomain = mkOption {
       type = types.str;
-      default = null;
+      default = "local";
     };
 
     slurmKey = lib.mkOption {

modules/k8s/scripts/restart-flannel.sh

@@ -4,10 +4,10 @@
 master=""
 node="flannel.service"
 
-nodes="@nodes@"
-master_node="@master@"
-# nodes=$(kubectl get nodes --no-headers | cut -d' ' -f1)
-# master_node=$(echo $nodes | cut -d' ' -f1)
+#nodes="@nodes@"
+#master_node="@master@"
+nodes=$(kubectl get nodes --no-headers | cut -d' ' -f1)
+master_node=$(echo $nodes | cut -d' ' -f1)
 
 echo "$master_node: systemctl restart $master"
 sudo systemctl restart $master

rossby/hosts.nix

@@ -1,2 +0,0 @@
-''
-''