fix: use jwt, simplify slurmrestd, and make slurmdbd optional
This commit is contained in:
@@ -19,13 +19,14 @@ let
|
||||
};
|
||||
|
||||
services.slurm = {
|
||||
clusterName=cfg.clusterName;
|
||||
controlMachine = cfg.controlMachine;
|
||||
nodeName = cfg.nodeName;
|
||||
partitionName = cfg.partitionName;
|
||||
extraConfig = ''
|
||||
# AccountingStorageType=accounting_storage/none
|
||||
AccountingStorageType=accounting_storage/slurmdbd
|
||||
AccountingStorageExternalHost=${cfg.dbdHosts}
|
||||
AccountingStorageHost=${cfg.dbdHost}
|
||||
JobAcctGatherType=jobacct_gather/linux
|
||||
MailDomain=${cfg.mailDomain}
|
||||
MailProg=/run/wrappers/bin/sendmail
|
||||
@@ -64,11 +65,12 @@ let
|
||||
# MailDomain=itpartner.no
|
||||
# MailProg=${pkgs.ssmtp}/bin/ssmtp
|
||||
# '';
|
||||
dbdserver = {
|
||||
enable = true;
|
||||
dbdHost = cfg.controlMachine;
|
||||
# storagePass = cfg.storagePass;
|
||||
};
|
||||
};
|
||||
|
||||
services.slurm.dbdserver = {
|
||||
enable = cfg.dbdServer;
|
||||
dbdHost = cfg.controlMachine;
|
||||
# storagePass = cfg.storagePass;
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 6817 ];
|
||||
@@ -166,6 +168,11 @@ in
|
||||
default = 307;
|
||||
};
|
||||
|
||||
clusterName = mkOption {
|
||||
type = types.str;
|
||||
default = null;
|
||||
};
|
||||
|
||||
pkey = mkOption {
|
||||
type = types.str;
|
||||
default = "0x7fff";
|
||||
@@ -176,9 +183,9 @@ in
|
||||
default = null;
|
||||
};
|
||||
|
||||
dbdHosts = mkOption {
|
||||
dbdHost = mkOption {
|
||||
type = types.str;
|
||||
default = null;
|
||||
default = "localhost";
|
||||
};
|
||||
|
||||
server = mkOption {
|
||||
@@ -186,6 +193,11 @@ in
|
||||
default = false;
|
||||
};
|
||||
|
||||
dbdServer = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
|
||||
client = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
|
||||
Reference in New Issue
Block a user