Add support for Slurm 17.11 and backwards compatibility with Slurm version < 17.11

Author: Carolina Lindqvist

README.md

@@ -133,8 +133,6 @@ To avoid version conflicts, the following packages will be installed/replaced by
 ```yaml
 - 'slurm',
 - 'slurm-devel',
-- 'slurm-munge',
-- 'slurm-plugins',
 - 'munge',
 - 'munge-libs',
 - 'munge-devel',
@@ -143,7 +141,6 @@ To avoid version conflicts, the following packages will be installed/replaced by
 #### On the database nodes
 ```yaml
 - 'slurm-slurmdbd',
-- 'slurm-sql',
 ```
 
 #### On the headnodes

manifests/config.pp

@@ -190,7 +190,7 @@
   Hash[Enum['task','energy','network','filesystem'],Integer[0]] $job_acct_gather_frequency = {'task' => 30,'energy' => 0,'network' => 0,'filesystem' => 0},
   Integer[0] $acct_gather_node_freq = 0,
   Enum['acct_gather_energy/none','acct_gather_energy/ipmi','acct_gather_energy/rapl'] $acct_gather_energy_type = 'acct_gather_energy/none',
-  Enum['acct_gather_infiniband/none','acct_gather_infiniband/ofed'] $acct_gather_infiniband_type = 'acct_gather_infiniband/none',
+  Enum['acct_gather_interconnect/none','acct_gather_interconnect/ofed','acct_gather_infiniband/ofed'] $acct_gather_interconnect_type = 'acct_gather_interconnect/none',
   Enum['acct_gather_filesystem/none','acct_gather_filesystem/lustre'] $acct_gather_filesystem_type = 'acct_gather_filesystem/none',
   Enum['acct_gather_profile/none','acct_gather_profile/hdf5'] $acct_gather_profile_type = 'acct_gather_profile/none',
 
@@ -333,11 +333,11 @@
   # Accounting gatherer configuration file
   if  ('acct_gather_energy/ipmi' in $acct_gather_energy_type) or
       ('acct_gather_profile/hdf5' in $acct_gather_profile_type) or
-      ('acct_gather_infiniband/ofed' in $acct_gather_infiniband_type) {
+      (['acct_gather_infiniband/ofed', 'acct_gather_interconnect/ofed'] in $acct_gather_interconnect_type) {
     class{ '::slurm::config::acct_gather':
-      with_energy_ipmi     => ('acct_gather_energy/ipmi' in $acct_gather_energy_type),
-      with_profile_hdf5    => ('acct_gather_profile/hdf5' in $acct_gather_profile_type),
-      with_infiniband_ofed => ('acct_gather_infiniband/ofed' in $acct_gather_infiniband_type),
+      with_energy_ipmi       => ('acct_gather_energy/ipmi' in $acct_gather_energy_type),
+      with_profile_hdf5      => ('acct_gather_profile/hdf5' in $acct_gather_profile_type),
+      with_interconnect_ofed => (['acct_gather_infiniband/ofed', 'acct_gather_interconnect/ofed'] in $acct_gather_interconnect_type),
     }
 
     $acct_gather_conf_file = ['/etc/slurm/acct_gather.conf']

manifests/config/acct_gather.pp

@@ -9,7 +9,7 @@
 # @param energy_ipmi_password Specify BMC Password.
 # @param profile_hdf5_dir This parameter is the path to the shared folder into which the acct_gather_profile plugin will write detailed data (usually as an HDF5 file).
 # @param profile_hdf5_default A comma delimited list of data types to be collected for each job submission.
-# @param infiniband_ofed_port This parameter represents the port number of the local Infiniband card that we are willing to monitor.
+# @param interconnect_ofed_port This parameter represents the port number of the local Infiniband card that we are willing to monitor.
 #
 # version 20170816
 #
@@ -30,8 +30,8 @@
   Boolean $with_profile_hdf5 = false,
   Optional[String] $profile_hdf5_dir = undef,
   String $profile_hdf5_default = 'None',
-  Boolean $with_infiniband_ofed = false,
-  Integer[0] $infiniband_ofed_port = 1,
+  Boolean $with_interconnect_ofed = false,
+  Integer[0] $interconnect_ofed_port = 1,
 ) {
 
   # AcctGather* plugin configuration

manifests/dbnode/setup.pp

@@ -17,6 +17,6 @@
   Array[String] $slurmdbd_packages = $slurm::params::slurmdbd_packages,
 ) inherits slurm::params {
 
-  ensure_packages($slurmdbd_packages, {'ensure' => $slurm::setup::slurm_version})
+  ensure_packages($slurm::params::slurmdbd_packages, {'ensure' => $slurm::params::slurm_version})
 
 }

manifests/headnode/setup.pp

@@ -21,7 +21,8 @@
   Array[String] $extra_packages = $slurm::params::extra_packages,
 ) inherits slurm::params {
 
-  ensure_packages($extra_packages, {'ensure' => $slurm::setup::slurm_version})
+  ensure_packages($extra_packages, {'ensure' => $slurm::params::slurm_version})
+  ensure_packages($slurm::params::slurmctld_package, {'ensure' => $slurm::params::slurm_version})
 
   file{ dirtree($slurm::config::state_save_location, $slurm::config::state_save_location) :
     ensure  => directory,

manifests/params.pp

@@ -3,37 +3,52 @@
 # Handles distribution-specific parameters for slurm::config, slurm::setup,
 # workernode::setup, headnode::setup, and dbnode::setup
 #
-# version 20170829
-# 
+# version 20171205
+#
 # Copyright (c) CERN, 2016-2017
 # Authors: - Philippe Ganz <[email protected]>
 #          - Carolina Lindqvist <[email protected]>
 #          - Pablo Llopis <[email protected]>
 # License: GNU GPL v3 or later.
 #
 
-class slurm::params {
+class slurm::params(
+  String $slurm_version = '17.02.6',
+  ) {
   case $facts['os']['family'] {
     'RedHat': {
-      $slurm_packages = [
+      $slurm_packages_common = [
         'slurm',
         'slurm-devel',
-        'slurm-munge',
-        'slurm-plugins',
       ]
       $munge_packages = [
         'munge',
         'munge-libs',
         'munge-devel',
       ]
-      $slurmdbd_packages = [
+      $slurmdbd_packages_common = [
         'slurm-slurmdbd',
-        'slurm-sql',
       ]
       $extra_packages = [
         'slurm-perlapi',
         'slurm-torque',
       ]
+
+      if versioncmp($slurm_version, '17.2') <= 0 {
+        $slurm_packages_old = ['slurm-munge', 'slurm-plugins']
+        $slurmdbd_packages_old = ['slurm-sql']
+        $slurmd_package = []
+        $slurmctld_package = []
+      } else {
+        $slurm_packages_old = []
+        $slurmdbd_packages_old = []
+        $slurmd_package = ['slurm-slurmd']
+        $slurmctld_package = ['slurm-slurmctld']
+      }
+
+    $slurm_packages = $slurm_packages_common + $slurm_packages_old
+    $slurmdbd_packages = $slurmdbd_packages_common + $slurmdbd_packages_old
+
     }
     default: {
       fail("OS family type ${facts['os']['family']} not supported.")

manifests/setup.pp

@@ -19,7 +19,6 @@
 #
 
 class slurm::setup (
-  String $slurm_version = '17.02.6',
   Integer[0] $slurm_gid = 950,
   Integer[0] $slurm_uid = 950,
   String $slurm_home_loc = '/usr/local/slurm',
@@ -32,7 +31,7 @@
 # SLURM
 ################################################################################
 
-  ensure_packages($slurm_packages, {'ensure' => $slurm_version})
+  ensure_packages($slurm::params::slurm_packages, {'ensure' => $slurm::params::slurm_version})
 
   group{ 'slurm':
     ensure => present,

manifests/workernode/setup.pp

@@ -21,7 +21,8 @@
   Array[String] $extra_packages = $slurm::params::extra_packages,
 ) inherits slurm::params {
 
-  ensure_packages($extra_packages, {'ensure' => $slurm::setup::slurm_version})
+  ensure_packages($extra_packages, {'ensure' => $slurm::params::slurm_version})
+  ensure_packages($slurm::params::slurmd_package, {'ensure' => $slurm::params::slurm_version})
 
   file{ dirtree($slurmd_spool_dir, $slurmd_spool_dir) :
     ensure  => directory,

templates/acct_gather.conf.erb

@@ -46,8 +46,8 @@ ProfileHDF5Default=<%= @profile_hdf5_default %>
 <% end -%>
 
 # Options used for AcctGatherInfinbandType/ofed
-<% if @with_infiniband_ofed -%>
-InfinibandOFEDPort=<%= @infiniband_ofed_port %>
+<% if @with_interconnect_ofed -%>
+InfinibandOFEDPort=<%= @interconnect_ofed_port %>
 <% else -%>
 #InfinibandOFEDPort=
 <% end %>

templates/slurm.conf.erb

@@ -306,7 +306,13 @@ JobAcctGatherFrequency=<%= @job_acct_gather_frequency.map{|pair| pair.join('=')}
 <%#                                                                          -%>
 AcctGatherNodeFreq=<%= @acct_gather_node_freq %>
 AcctGatherEnergyType=<%= @acct_gather_energy_type %>
-AcctGatherInfinibandType=<%= @acct_gather_infiniband_type %>
+<% if @acct_gather_interconnect_type =="acct_gather_infiniband/ofed" -%>
+AcctGatherInfinibandType=<%= @acct_gather_interconnect_type %>
+<% elsif @acct_gather_interconnect_type == "acct_gather_interconnect/ofed" -%>
+AcctGatherInterconnectType=<%= @acct_gather_interconnect_type %>
+<% else -%>
+AcctGatherInterconnectType=acct_gather_interconnect/none
+<% end -%>
 AcctGatherFilesystemType=<%= @acct_gather_filesystem_type %>
 AcctGatherProfileType=<%= @acct_gather_profile_type %>