oceanbox/platform
6
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: fix slurmdbd setup

Browse Source
This commit is contained in:
Jonas Juselius
2025-09-25 15:52:30 +02:00
parent bcff2e6c2f
commit c9624213ed
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/hpc/slurm.nix
View File

@@ -25,6 +25,7 @@ let
extraConfig = '' extraConfig = ''
# AccountingStorageType=accounting_storage/none # AccountingStorageType=accounting_storage/none
AccountingStorageType=accounting_storage/slurmdbd AccountingStorageType=accounting_storage/slurmdbd
AccountingStorageExternalHost=${cfg.dbdHosts}
JobAcctGatherType=jobacct_gather/linux JobAcctGatherType=jobacct_gather/linux
MailDomain=${cfg.mailDomain} MailDomain=${cfg.mailDomain}
MailProg=/run/wrappers/bin/sendmail MailProg=/run/wrappers/bin/sendmail
@@ -65,7 +66,7 @@ let
# ''; # '';
dbdserver = { dbdserver = {
enable = true; enable = true;
dbdHost = cfg.dbdHost; dbdHost = cfg.controlMachine;
# storagePass = cfg.storagePass; # storagePass = cfg.storagePass;
}; };
}; };
@@ -120,13 +121,6 @@ let
slurmrestd = { slurmrestd = {
services.dnsmasq.enable = true;
services.dnsmasq.settings = {
domain = [ "cluster.local" ];
address = [ "/slurmctld.cluster.local/127.0.0.1" ];
srv-host= "_slurmctld._tcp.cluster.local,slurmctld.cluster.local,6817,0,5";
};
systemd.services.slurmrestd = { systemd.services.slurmrestd = {
description = "Slurm REST API service"; description = "Slurm REST API service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@@ -182,7 +176,7 @@ in
default = null; default = null;
}; };
dbdHost = mkOption { dbdHosts = mkOption {
type = types.str; type = types.str;
default = null; default = null;
}; };

15
rossby/manage/default.nix
View File

@@ -49,7 +49,7 @@ in {
automount.enable = true; automount.enable = true;
users = false; users = false;
opt = true; opt = true;
work = true; work = false;
data = true; data = true;
ceph = true; ceph = true;
}; };
@@ -78,7 +78,7 @@ in {
slurm.server = true; slurm.server = true;
slurm.slurmrestd = true; slurm.slurmrestd = true;
slurm.mungeUid = 993; slurm.mungeUid = 993;
slurm.dbdHost = "ekman-manage.obx.hs"; slurm.dbdHosts = "ekman-manage.obx.hs";
manageNode = true; manageNode = true;
}; };
@@ -265,13 +265,16 @@ in {
''; '';
}; };
services.dnsmasq.enable = true;
services.dnsmasq.settings = { services.dnsmasq.settings = {
domain = [ "hbx.hs" ]; domain = [ "cluster.local" ];
server = [ server = [
"8.8.8.8"
"/obx.hs/100.100.100.100" # headscale dns "/obx.hs/100.100.100.100" # headscale dns
]; ];
address = [ ]; address = [
"/slurmctld.cluster.local/127.0.0.1"
];
srv-host = "_slurmctld._tcp.cluster.local,slurmctld.cluster.local,6817,0,5";
}; };
# Use nvd to get package diff before apply # Use nvd to get package diff before apply
@@ -325,7 +328,7 @@ in {
useRoutingFeatures = "both"; # for exit-node usage useRoutingFeatures = "both"; # for exit-node usage
extraUpFlags = [ extraUpFlags = [
"--login-server=https://headscale.svc.oceanbox.io" "--login-server=https://headscale.svc.oceanbox.io"
# "--accept-dns=true" # see dnsmasq "--accept-dns=true" # see dnsmasq
"--advertise-exit-node" "--advertise-exit-node"
"--advertise-routes=172.16.239.0/24,172.16.238.0/24" "--advertise-routes=172.16.239.0/24,172.16.238.0/24"
]; ];