fix: slurm and stuff

rossby/c0/default.nix

@@ -38,7 +38,7 @@ let
           address = host.address;
         };
         os.externalInterface = host.iface;
-        hpc.compute = true;
+        hpc.computeNode = true;
         # hpc.knem = true;
       };
 

rossby/fs-work/default.nix

@@ -54,7 +54,7 @@ in {
       };
 
       os = {
-        externalInterface = "enp66s0np0";
+        externalInterface = "enp1s0np0";
         nfs.enable = true;
         nfs.exports = ''
           /exports 172.16.239.0/24(insecure,rw,async,no_subtree_check,crossmnt,fsid=0,no_root_squash)
@@ -99,7 +99,8 @@ in {
 
     networking = {
       hostName = name;
-      interfaces.enp66s0np0 = {
+      interfaces.enp129s0f0.useDHCP = false;
+      interfaces.enp1s0np0 = {
         useDHCP = false;
         ipv4.addresses = [
           {
@@ -147,6 +148,11 @@ in {
 
     programs.singularity.enable = true;
 
+    boot.kernelParams = [
+      "amd_iommu=on" "iommu=pt"
+    ];
+    boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_16;
+
     imports = [
         ./hardware-configuration.nix
         ../default.nix

rossby/fs-work/hardware-configuration.nix

@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "mpt3sas" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "megaraid_sas" "ahci" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];

rossby/login/default.nix

@@ -50,8 +50,8 @@ in
       hpc = {
         slurm.server = false;
         slurm.slurmrestd = false;
-        manage = false;
-        login = true;
+        manageNode = false;
+        loginNode = true;
         knem = false;
       };
 

rossby/manage/default.nix

@@ -78,7 +78,8 @@ in {
         slurm.server = true;
         slurm.slurmrestd = true;
         slurm.mungeUid = 993;
-        manage = true;
+        slurm.dbdHost = "ekman-manage.obx.hs";
+        manageNode = true;
       };
 
       k8s = {
@@ -264,6 +265,15 @@ in {
         '';
     };
 
+    services.dnsmasq.settings = {
+      domain = [ "hbx.hs" ];
+      server = [
+        "8.8.8.8"
+        "/obx.hs/100.100.100.100" # headscale dns
+      ];
+      address = [ ];
+    };
+
     # Use nvd to get package diff before apply
     system.activationScripts.system-diff = {
      supportsDryActivation = true; # safe: only outputs to stdout
@@ -315,7 +325,7 @@ in {
     useRoutingFeatures = "both"; # for exit-node usage
     extraUpFlags = [
       "--login-server=https://headscale.svc.oceanbox.io"
-      "--accept-dns=true"
+      # "--accept-dns=true" # see dnsmasq
       "--advertise-exit-node"
       "--advertise-routes=172.16.239.0/24,172.16.238.0/24"
     ];