From 59db74b265c88a558bd831294b792bc6b17ae7bf Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Tue, 16 Sep 2025 13:42:25 +0200 Subject: [PATCH] fix: misc fixes and tweaks --- modules/default.nix | 1 + modules/hpc/default.nix | 1 - modules/hpc/slurm.nix | 4 ++-- modules/k8s/default.nix | 2 +- rossby/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/default.nix b/modules/default.nix index 7f42b3f..6a80061 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -17,6 +17,7 @@ with lib; imports = [ ./k8s ./hpc + ./mft ./fs ./pki/certs.nix ../nixos diff --git a/modules/hpc/default.nix b/modules/hpc/default.nix index 7b9e1a5..11fa4c2 100644 --- a/modules/hpc/default.nix +++ b/modules/hpc/default.nix @@ -4,6 +4,5 @@ ./hpc.nix ./slurm.nix ./monitoring.nix - ./mft ]; } diff --git a/modules/hpc/slurm.nix b/modules/hpc/slurm.nix index f6a8d25..97bd829 100644 --- a/modules/hpc/slurm.nix +++ b/modules/hpc/slurm.nix @@ -142,8 +142,8 @@ let description = "Proxy slurmrestd unix socket to port 6822"; listenStreams = [ "0.0.0.0:6822" ]; wantedBy = [ "sockets.target" ]; - # Allow multiple instances of corresponding service. - socketConfig.Accept = true; + # If 'true', allow multiple instances of corresponding service (fails) + socketConfig.Accept = false; }; systemd.services."slurm-http-proxy@" = { diff --git a/modules/k8s/default.nix b/modules/k8s/default.nix index fd9a41f..934b56d 100644 --- a/modules/k8s/default.nix +++ b/modules/k8s/default.nix @@ -470,7 +470,7 @@ in { imports = [ # ../overrides/kubernetes_default.nix - # ../overrides/kubelet.nix + ../overrides/kubelet.nix ]; } diff --git a/rossby/default.nix b/rossby/default.nix index 6c141e9..5e7ab7d 100644 --- a/rossby/default.nix +++ b/rossby/default.nix @@ -94,7 +94,7 @@ let }; cachix.enable = false; monitoring.nodeExporter.enable = false; - hpc.mft.enable = false; # Mellanox MFT + mft.enable = true; # Mellanox MFT }; networking = {