Skip to content

Commit 4227904

Browse files
committed
Fix slurmd spooldir to be consistent/default
1 parent 95fb3e9 commit 4227904

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

manifests/init.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,7 @@
667667
Integer $slurmdtimeout = $slurm::params::slurmdtimeout,
668668
Array $slurmctldparameters = $slurm::params::slurmctldparameters,
669669
Array $slurmdparameters = $slurm::params::slurmdparameters,
670+
String $slurmdspooldir = $slurm::params::slurmdspooldir,
670671
String $srunportrange = $slurm::params::srunportrange,
671672
String $srunepilog = $slurm::params::srunepilog,
672673
String $srunprolog = $slurm::params::srunprolog,

manifests/params.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@
277277
$slurmdtimeout = 300
278278
$slurmctldparameters = []
279279
$slurmdparameters = []
280+
$slurmdspooldir = ''
280281
$srunportrange = '50000-53000'
281282
$srunepilog = ''
282283
$srunprolog = ''

templates/slurm.conf.erb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,11 @@ SlurmdParameters=<%= scope['slurm::slurmdparameters'].join(',') %>
128128
<% end -%>
129129
SlurmdPidFile=/var/run/slurmd.pid
130130
SlurmdPort=<%= scope['slurm::slurmdport'] %>
131-
SlurmdSpoolDir=<%= scope['slurm::statesavelocation'] %>
131+
<% if scope['slurm::slurmdspooldir'].empty? -%>
132+
#SlurmdSpoolDir=
133+
<% else -%>
134+
SlurmdSpoolDir=<%= scope['slurm::slurmdspooldir'] %>
135+
<% end -%>
132136
<% if scope['slurm::srunepilog'].empty? -%>
133137
#SrunEpilog=
134138
<% else -%>

0 commit comments

Comments
 (0)