Merge branch 'release/1.1.3' into production

ULHPC · Feb 15, 2018 · bec0308 · bec0308
2 parents 62f8a71 + 2ebcb2a
commit bec0308
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -141,6 +141,7 @@
 #           Elligible values in ["none", "elasticsearch", "filetxt", "mysql", "script"]
 # @param jobcontainertype         [String]      Default: 'none'
 #           Elligible values in ['cncu', 'none'] (CNCU = Compute Node Clean Up on Cray)
+# @param jobrequeue               [Boolean]     Default: true
 # @param jobsubmitplugins         [Array]       Default: [ 'lua' ]
 # @param killwait                 [Integer]     Default: 30
 #           interval (in seconds) given to a jobs processes between the SIGTERM and SIGKILL
@@ -480,6 +481,7 @@
   String  $jobcomploc                     = $slurm::params::jobcomploc,
   String  $jobcomptype                    = $slurm::params::jobcomptype,
   String  $jobcontainertype               = $slurm::params::jobcontainertype,
+  Boolean $jobrequeue                     = $slurm::params::jobrequeue,
   Array   $jobsubmitplugins               = $slurm::params::jobsubmitplugins,
   Integer $killwait                       = $slurm::params::killwait,
   String  $launchtype                     = $slurm::params::launchtype,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -173,6 +173,7 @@
   $jobcomploc              = 'slurmjobs' # where job completion records are written (DB name, filename...)
   $jobcomptype             = 'none'      # in ["none", "elasticsearch", "filetxt", "mysql", "script"]
   $jobcontainertype        = 'none'      # In ['cncu', 'none'] (CNCU = Compute Node Clean Up on Cray)
+  $jobrequeue              = true
   $jobsubmitplugins        = [ 'lua' ]   #
   $killwait                = 30          # sec. interval given to a job's processes between the SIGTERM and SIGKILL
   $launchtype              = 'slurm'

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "ULHPC-slurm",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "author": "UL HPC Team",
   "mail": "hpc-sysadmins@uni.lu",
   "summary": "Configure and manage Slurm: A Highly Scalable Resource Manager",

diff --git a/templates/slurm.conf.erb b/templates/slurm.conf.erb
@@ -78,7 +78,7 @@ JobCheckpointDir=<%= scope['slurm::jobcheckpointdir'] %>
 #JobCredentialPrivateKey=
 #JobCredentialPublicCertificate=
 #JobFileAppend=0
-#JobRequeue=1
+JobRequeue=<%= scope['slurm::jobrequeue'] ? 1 : 0 %>
 #KillOnBadExit=0
 TmpFS=<%= scope['slurm::tmpfs'] %>
 #TrackWCKey=no