Skip to content

Commit f381c72

Browse files
authored
Merge pull request #118 from stackhpc/fix/116
Tidy slurm.conf templating & use modern parameters
2 parents c9a2204 + 94e5937 commit f381c72

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

templates/slurm.conf.j2

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,15 @@ PreemptType=preempt/partition_prio
7777
PreemptMode=SUSPEND,GANG
7878
#
7979
# LOGGING
80-
# Silence warnings about configuration file mismatches.
81-
DebugFlags=NO_CONF_HASH
82-
SlurmctldDebug=3
83-
#SlurmctldLogFile=
84-
SlurmdDebug=3
85-
#SlurmdLogFile=
86-
JobCompType={{ openhpc_slurm_job_comp_type }}
87-
JobCompLoc={{ openhpc_slurm_job_comp_loc }}
80+
# By default, SLURM will log to syslog, which is what we want
81+
SlurmctldSyslogDebug=info
82+
SlurmdSyslogDebug=info
8883
#
8984
# ACCOUNTING
9085
JobAcctGatherType={{ openhpc_slurm_job_acct_gather_type }}
9186
JobAcctGatherFrequency={{ openhpc_slurm_job_acct_gather_frequency }}
87+
JobCompType={{ openhpc_slurm_job_comp_type }}
88+
JobCompLoc={{ openhpc_slurm_job_comp_loc }}
9289
#
9390
AccountingStorageType={{ openhpc_slurm_accounting_storage_type }}
9491
AccountingStorageHost={{ openhpc_slurm_accounting_storage_host }}
@@ -107,9 +104,6 @@ NodeName={{ node }}
107104
# COMPUTE NODES
108105
# OpenHPC default configuration
109106
PropagateResourceLimitsExcept=MEMLOCK
110-
# By default, SLURM will log to syslog, which is what we want
111-
#SlurmdLogFile=/var/log/slurm.log
112-
#SlurmctldLogFile=/var/log/slurmctld.log
113107
Epilog=/etc/slurm/slurm.epilog.clean
114108
{% for part in openhpc_slurm_partitions %}
115109
{% for group in part.get('groups', [part]) %}

0 commit comments

Comments
 (0)