Skip to content

Commit 30ae896

Browse files
committed
Add SlurmctldParameters support
1 parent 5417164 commit 30ae896

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

manifests/config.pp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
String $tmp_fs = '/tmp',
8888
Enum['no','yes'] $track_wckey = 'no',
8989
Optional[String] $unkillable_step_program = undef,
90+
Optional[Array[String]] $slurmctld_parameters = undef,
9091

9192
Enum['auth/none','auth/munge'] $auth_type = 'auth/munge',
9293
Optional[String] $auth_info = undef,
@@ -241,6 +242,18 @@
241242
}
242243
}
243244

245+
if $slurmctld_parameters != undef {
246+
if versioncmp('18.08', $slurm::params::slurm_version) > 0 {
247+
fail('Parameter SlurmctldParameters is supported from version 18.08 onwards.')
248+
}
249+
}
250+
251+
if $resume_fail_program != undef
252+
if versioncmp('18.08', $slurm::params::slurm_version) > 0 {
253+
fail('Parameter ResumeFailProgram is supported from version 18.08 onwards.')
254+
}
255+
}
256+
244257
# Authentication service for SLURM if MUNGE is used as authentication plugin
245258
if ($auth_type == 'auth/munge') or
246259
($cred_type == 'cred/munge') {

templates/slurm.conf.erb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@ SlurmctldPidFile=<%= @slurmctld_pid_file %>
125125
<% else -%>
126126
SlurmctldPlugstack=<%= @slurmctld_plugstack.join(',') %>
127127
<% end -%>
128+
<%# comment out if empty, expand array if not -%>
129+
<% if @slurmctld_parameters.nil? -%>
130+
#SlurmctldParameters=
131+
<% else -%>
132+
SlurmctldParameters=<%= @slurmctld_parameters.join(',') %>
133+
<% end -%>
128134
<%# -%>
129135
SlurmctldPort=<%= @slurmctld_port %>
130136
SlurmdPidFile=<%= @slurmd_pid_file %>

0 commit comments

Comments
 (0)