From ff792f5f4834329f2e0b9640b52ad5f449510ae2 Mon Sep 17 00:00:00 2001 From: Aleix Roca Nonell Date: Fri, 9 Feb 2024 11:14:34 +0100 Subject: [PATCH] Move slurm client in a separate module Reviewed-by: Rodrigo Arias Mallo --- m/bay/configuration.nix | 4 ---- m/common/main.nix | 1 - m/eudy/configuration.nix | 1 - m/eudy/slurm.nix | 7 ------- m/hut/configuration.nix | 3 ++- m/hut/{slurm-daemon.nix => slurm-server.nix} | 0 m/koro/configuration.nix | 1 - m/lake2/configuration.nix | 4 ---- m/{common/slurm.nix => module/slurm-client.nix} | 0 m/owl1/configuration.nix | 1 + m/owl2/configuration.nix | 1 + 11 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 m/eudy/slurm.nix rename m/hut/{slurm-daemon.nix => slurm-server.nix} (100%) rename m/{common/slurm.nix => module/slurm-client.nix} (100%) diff --git a/m/bay/configuration.nix b/m/bay/configuration.nix index 5e2b342..70b7165 100644 --- a/m/bay/configuration.nix +++ b/m/bay/configuration.nix @@ -13,10 +13,6 @@ ceph ]; - services.slurm = { - client.enable = lib.mkForce false; - }; - networking = { hostName = "bay"; interfaces.eno1.ipv4.addresses = [ { diff --git a/m/common/main.nix b/m/common/main.nix index 2844b3f..4a4671d 100644 --- a/m/common/main.nix +++ b/m/common/main.nix @@ -8,7 +8,6 @@ ./hw.nix ./net.nix ./ntp.nix - ./slurm.nix ./ssh.nix ./users.nix ./watchdog.nix diff --git a/m/eudy/configuration.nix b/m/eudy/configuration.nix index 7d1f5e1..b0889d8 100644 --- a/m/eudy/configuration.nix +++ b/m/eudy/configuration.nix @@ -9,7 +9,6 @@ ./cpufreq.nix ./fs.nix ./users.nix - ./slurm.nix ../module/debuginfod.nix ]; diff --git a/m/eudy/slurm.nix b/m/eudy/slurm.nix deleted file mode 100644 index 0aa3bda..0000000 --- a/m/eudy/slurm.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, ... }: - -{ - services.slurm = { - client.enable = lib.mkForce false; - }; -} diff --git a/m/hut/configuration.nix b/m/hut/configuration.nix index 5c8e39a..4014b57 100644 --- a/m/hut/configuration.nix +++ b/m/hut/configuration.nix @@ -6,10 +6,11 @@ ../module/ceph.nix ../module/debuginfod.nix + ../module/slurm-client.nix ./gitlab-runner.nix ./monitoring.nix ./nfs.nix - ./slurm-daemon.nix + ./slurm-server.nix ./nix-serve.nix ./public-inbox.nix #./pxe.nix diff --git a/m/hut/slurm-daemon.nix b/m/hut/slurm-server.nix similarity index 100% rename from m/hut/slurm-daemon.nix rename to m/hut/slurm-server.nix diff --git a/m/koro/configuration.nix b/m/koro/configuration.nix index 6623549..9c92ef3 100644 --- a/m/koro/configuration.nix +++ b/m/koro/configuration.nix @@ -7,7 +7,6 @@ ../eudy/cpufreq.nix ../eudy/users.nix - ../eudy/slurm.nix ./users.nix ./kernel.nix ]; diff --git a/m/lake2/configuration.nix b/m/lake2/configuration.nix index 58bfef8..aacf5b9 100644 --- a/m/lake2/configuration.nix +++ b/m/lake2/configuration.nix @@ -12,10 +12,6 @@ ceph ]; - services.slurm = { - client.enable = lib.mkForce false; - }; - services.ceph = { enable = true; global = { diff --git a/m/common/slurm.nix b/m/module/slurm-client.nix similarity index 100% rename from m/common/slurm.nix rename to m/module/slurm-client.nix diff --git a/m/owl1/configuration.nix b/m/owl1/configuration.nix index d21ccfd..b208139 100644 --- a/m/owl1/configuration.nix +++ b/m/owl1/configuration.nix @@ -4,6 +4,7 @@ imports = [ ../common/main.nix ../module/ceph.nix + ../module/slurm-client.nix ../module/slurm-firewall.nix ../module/slurm-hut-nix-store.nix ]; diff --git a/m/owl2/configuration.nix b/m/owl2/configuration.nix index 5fdabbe..fac678b 100644 --- a/m/owl2/configuration.nix +++ b/m/owl2/configuration.nix @@ -4,6 +4,7 @@ imports = [ ../common/main.nix ../module/ceph.nix + ../module/slurm-client.nix ../module/slurm-firewall.nix ../module/slurm-hut-nix-store.nix ];