diff --git a/modules/hpc/hpc.nix b/modules/hpc/hpc.nix index 0641cf3..b955f1f 100644 --- a/modules/hpc/hpc.nix +++ b/modules/hpc/hpc.nix @@ -70,7 +70,7 @@ let ''; }; - manager = { + manage = { services.influxdb.enable = true; features.monitoring.nodeExporter.extraCollectors = [ "nfsd" ]; }; @@ -141,7 +141,7 @@ in options.features.hpc = { enable = mkEnableOption "Enable HPC features"; - manager = mkEnableOption "Enable management features"; + manage = mkEnableOption "Enable management features"; login = mkEnableOption "Enable login node features"; @@ -153,7 +153,7 @@ in config = mkIf cfg.enable (mkMerge [ configuration - (mkIf cfg.manager manager) + (mkIf cfg.manage manage) (mkIf cfg.login login) diff --git a/rossby/login/default.nix b/rossby/login/default.nix index a73530d..930ce6c 100644 --- a/rossby/login/default.nix +++ b/rossby/login/default.nix @@ -50,7 +50,7 @@ in hpc = { slurm.server = false; slurm.slurmrestd = false; - manager = false; + manage = false; login = true; knem = false; }; diff --git a/rossby/manage/default.nix b/rossby/manage/default.nix index dd2159e..84f9a21 100644 --- a/rossby/manage/default.nix +++ b/rossby/manage/default.nix @@ -78,7 +78,7 @@ in { slurm.server = true; slurm.slurmrestd = true; slurm.mungeUid = 993; - manager = true; + manage = true; }; k8s = {