diff --git a/m/apex/configuration.nix b/m/apex/configuration.nix index 540e507..a18bbfc 100644 --- a/m/apex/configuration.nix +++ b/m/apex/configuration.nix @@ -5,6 +5,8 @@ ../common/xeon.nix ../common/ssf/hosts.nix ../module/ceph.nix + ../module/slurm-client.nix + ../module/slurm-server.nix ./nfs.nix ]; diff --git a/m/hut/configuration.nix b/m/hut/configuration.nix index 493208c..d301b92 100644 --- a/m/hut/configuration.nix +++ b/m/hut/configuration.nix @@ -11,7 +11,6 @@ ./gitlab-runner.nix ./monitoring.nix ./nfs.nix - ./slurm-server.nix ./nix-serve.nix ./public-inbox.nix ./gitea.nix diff --git a/m/module/slurm-client.nix b/m/module/slurm-client.nix index 21ae945..02b5208 100644 --- a/m/module/slurm-client.nix +++ b/m/module/slurm-client.nix @@ -39,7 +39,7 @@ in { services.slurm = { client.enable = true; - controlMachine = "hut"; + controlMachine = "apex"; clusterName = "jungle"; nodeName = [ "owl[1,2] Sockets=2 CoresPerSocket=14 ThreadsPerCore=2 Feature=owl" diff --git a/m/hut/slurm-server.nix b/m/module/slurm-server.nix similarity index 100% rename from m/hut/slurm-server.nix rename to m/module/slurm-server.nix