summary refs log tree commit diff
path: root/nixos/modules/services/computing
diff options
context:
space:
mode:
authorMarkus Kowalewski <markus.kowalewski@gmail.com>2018-09-02 02:37:29 +0200
committerMarkus Kowalewski <markus.kowalewski@gmail.com>2018-09-08 23:14:54 +0200
commit0051772890908ec8323d4fe1c4ffdb8498f3b759 (patch)
treeed72e90b90cd52e9f4bc90f219c7222c2fce9f7d /nixos/modules/services/computing
parent7a5b42161f59d7398d1f88af10c178ce592ff387 (diff)
downloadnixlib-0051772890908ec8323d4fe1c4ffdb8498f3b759.tar
nixlib-0051772890908ec8323d4fe1c4ffdb8498f3b759.tar.gz
nixlib-0051772890908ec8323d4fe1c4ffdb8498f3b759.tar.bz2
nixlib-0051772890908ec8323d4fe1c4ffdb8498f3b759.tar.lz
nixlib-0051772890908ec8323d4fe1c4ffdb8498f3b759.tar.xz
nixlib-0051772890908ec8323d4fe1c4ffdb8498f3b759.tar.zst
nixlib-0051772890908ec8323d4fe1c4ffdb8498f3b759.zip
nixos/slurm: add option clusterName
slurm 18.08 requires ClusterName to be set
(set to default).
Diffstat (limited to 'nixos/modules/services/computing')
-rw-r--r--nixos/modules/services/computing/slurm/slurm.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 1e1c5bc9f035..09174ed39f5e 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -8,6 +8,7 @@ let
   # configuration file can be generated by http://slurm.schedmd.com/configurator.html
   configFile = pkgs.writeTextDir "slurm.conf"
     ''
+      ClusterName=${cfg.clusterName}
       ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
       ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
       ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
@@ -105,6 +106,15 @@ in
         '';
       };
 
+      clusterName = mkOption {
+        type = types.str;
+        default = "default";
+        example = "myCluster";
+        description = ''
+          Necessary to distinguish accounting records in a multi-cluster environment.
+        '';
+      };
+
       nodeName = mkOption {
         type = types.nullOr types.str;
         default = null;