Skip to content

Commit 65fa424

Browse files
committed
Add AccountStoreFlags, add BcastExclude, rename SbcastParameters to BcastParameters
1 parent 73b9100 commit 65fa424

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

manifests/config.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
Optional[String] $resv_prolog = undef,
6262
Integer[0,2] $return_to_service = 0,
6363
Optional[String] $salloc_default_command = undef,
64-
Optional[Hash[Enum['DestDir','Compression'],String]] $sbcast_parameters = undef,
64+
Optional[Array[String]] $bcast_exclude = ['/lib', '/usr/lib', '/lib64', '/usr/lib64'],
65+
Optional[Hash[Enum['send_libs', 'DestDir','Compression'],String]] $bcast_parameters = undef,
6566
String $slurmctld_pid_file = '/var/run/slurmctld.pid',
6667
Optional[Array[String]] $slurmctld_plugstack = undef,
6768
Integer[1] $slurmctld_port = 6817,
@@ -174,8 +175,8 @@
174175
Optional[Array[String]] $accounting_storage_tres = undef,
175176
Enum['accounting_storage/mysql','accounting_storage/none','accounting_storage/slurmdbd'] $accounting_storage_type = 'accounting_storage/none',
176177
Optional[String] $accounting_storage_user = undef,
178+
Optional[Array[String]] $accounting_store_flags = undef,
177179
Optional[String] $accounting_storage_pass = undef,
178-
Enum['NO','YES'] $accounting_store_jobhost = 'YES',
179180
Enum['jobcomp/none','jobcomp/elasticsearch','jobcomp/filetxt','jobcomp/mysql','jobcomp/script'] $job_comp_type = 'jobcomp/none',
180181
Optional[String] $job_comp_host = undef,
181182
Integer[0] $job_comp_port = 6819,

templates/slurm.conf.erb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,12 @@ PropagateResourceLimitsExcept=<%= @propagate_resource_limits_except.join(',') %>
108108
<%= @resv_prolog.nil? ? '#ResvProlog=' : ('ResvProlog=' + @resv_prolog) %>
109109
ReturnToService=<%= @return_to_service %>
110110
<%= @salloc_default_command.nil? ? '#SallocDefaultCommand=' : ('SallocDefaultCommand=' + @salloc_default_command) %>
111+
<%= @bcast_exclude.nil? ? '#BcastExclude=' : ('BcastExclude=' + @bcast_exclude.join(',')) %>
111112
<%# comment out if empty, expand hash if not -%>
112113
<% if @sbcast_parameters.nil? -%>
113114
#SbcastParameters=
114115
<% else -%>
115-
SbcastParameters=<%= @sbcast_parameters.map{|pair| pair.join('=')}.join(',') %>
116+
BcastParameters=<%= @bcast_parameters.map{|pair| pair.join('=')}.join(',') %>
116117
<% end -%>
117118
<%# -%>
118119
SlurmctldPidFile=<%= @slurmctld_pid_file %>
@@ -293,9 +294,9 @@ AccountingStorageTRES=<%= @accounting_storage_tres.join(',') %>
293294
<%# -%>
294295
AccountingStorageType=<%= @accounting_storage_type %>
295296
<%= @accounting_storage_user.nil? ? '#AccountingStorageUser=' : ('AccountingStorageUser=' + @accounting_storage_user) %>
297+
<%= @accounting_store_flags.nil? ? '#AccountingStoreFlags=' : ('AccountingStoreFlags=' + @accounting_store_flags.join(',')) %>
296298
<%= @accounting_storage_pass.nil? ? '#AccountingStoragePass=' : ('AccountingStoragePass=' + @accounting_storage_pass) %>
297299
<%= @accounting_storage_loc.nil? ? '#AccountingStorageLoc=' : ('AccountingStorageLoc=' + @accounting_storage_loc) %>
298-
AccountingStoreJobComment=<%= @accounting_store_jobhost %>
299300
JobCompType=<%= @job_comp_type %>
300301
<%= @job_comp_host.nil? ? '#JobCompHost=' : ('JobCompHost=' + @job_comp_host) %>
301302
JobCompPort=<%= @job_comp_port %>

0 commit comments

Comments
 (0)