diff --git a/m/fox/configuration.nix b/m/fox/configuration.nix index 60ab5b0f..3a188a63 100644 --- a/m/fox/configuration.nix +++ b/m/fox/configuration.nix @@ -5,8 +5,6 @@ ../common/xeon.nix ../module/ceph.nix ../module/emulation.nix - ../module/slurm-client.nix - ../module/slurm-firewall.nix ]; # Select the this using the ID to avoid mismatches diff --git a/m/module/slurm-client.nix b/m/module/slurm-client.nix index 46478a81..21ae9458 100644 --- a/m/module/slurm-client.nix +++ b/m/module/slurm-client.nix @@ -43,13 +43,11 @@ in { clusterName = "jungle"; nodeName = [ "owl[1,2] Sockets=2 CoresPerSocket=14 ThreadsPerCore=2 Feature=owl" - "fox Sockets=2 CoresPerSocket=96 ThreadsPerCore=1 Feature=fox" "hut Sockets=2 CoresPerSocket=14 ThreadsPerCore=2" ]; partitionName = [ "owl Nodes=owl[1-2] Default=YES DefaultTime=01:00:00 MaxTime=INFINITE State=UP" - "fox Nodes=fox Default=NO DefaultTime=01:00:00 MaxTime=INFINITE State=UP" ]; # See slurm.conf(5) for more details about these options. @@ -77,7 +75,7 @@ in { SuspendTimeout=60 ResumeProgram=${resumeProgram} ResumeTimeout=300 - SuspendExcNodes=hut,fox + SuspendExcNodes=hut # Turn the nodes off after 1 hour of inactivity SuspendTime=3600