allow link dir within slurm::repo

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
ULHPC · Sep 6, 2017 · 4f17150 · 4f17150
1 parent c306da4
commit 4f17150
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,5 +1,5 @@
 ################################################################################
-# Time-stamp: <Mon 2017-09-04 21:24 svarrette>
+# Time-stamp: <Wed 2017-09-06 18:35 svarrette>
 #
 # File::      <tt>init.pp</tt>
 # Author::    UL HPC Team (hpc-sysadmins@uni.lu)
@@ -79,6 +79,12 @@
 # @param configdir                [String]      Default: '/etc/slurm'
 # @param clustername              [String]      Default: 'cluster'
 #          The name by which this Slurm managed cluster is known in the accounting database
+#
+# @param acct_gatherenergytype    [String]   Default: 'none'
+#          Identifies the plugin to be used for energy consumption accounting
+#          Elligible values in [ 'none', 'ipmi', 'rapl' ]
+# @paraù acct_storageenforce      [Array]       Default: ['qos', 'limits', 'associations']
+#          What level of association-based enforcement to impose on job submissions.
 # @param authtype                 [String]      Default: 'munge'
 #          Elligible values in [ 'none', 'munge' ]
 # @param authinfo                 [String]      Default: ''
@@ -425,6 +431,7 @@
   # Main configuration paramaters
   #
   Array   $acct_storageenforce            = $slurm::params::acct_storageenforce,
+  String  $acct_gatherenergytype          = $slurm::params::acct_gatherenergytype,
   String  $configdir                      = $slurm::params::configdir,
   String  $clustername                    = $slurm::params::clustername,
   String  $authtype                       = $slurm::params::authtype,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,5 +1,5 @@
 ################################################################################
-# Time-stamp: <Tue 2017-09-05 16:42 svarrette>
+# Time-stamp: <Wed 2017-09-06 11:45 svarrette>
 #
 # File::      <tt>params.pp</tt>
 # Author::    UL HPC Team (hpc-sysadmins@uni.lu)
@@ -132,6 +132,7 @@
 
   # What level of association-based enforcement to impose on job submissions
   $acct_storageenforce     = ['qos', 'limits', 'associations']
+  $acct_gatherenergytype   = 'none'
   $batchstarttimeout       = 10
   $checkpointtype          = 'none'  # in ['blcr', 'none', 'ompi', 'poe']
   $completewait            = 0

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -1,5 +1,5 @@
 ################################################################################
-# Time-stamp: <Tue 2017-09-05 17:29 svarrette>
+# Time-stamp: <Wed 2017-09-06 18:44 svarrette>
 #
 # File::      <tt>repo.pp</tt>
 # Author::    UL HPC Team (hpc-sysadmins@uni.lu)
@@ -50,22 +50,32 @@
 #          Typically a Git repository URL or a hash of remotename => URL mappings
 # @param branch       [String]  Default: 'HEAD'
 #          The branch/revision to pull
+# @param linkdir      [String]  Default: ''
+#          An Optional link to create pointing to the working copy of the repository (Ex: "/etc/slurm-${slurm::clustername}")
 #
 # @example Clone the SLURM control repository into '/usr/local/src/git/ULHPC/slurm'
-#
+# # Create the SSH key, using for instance the maestrodev/ssh_keygen module
+# ssh_keygen { $slurm::username:
+  #    comment => "${slurm::username}@${::fqdn}",
+  #    home    => $slurm::params::home,
+  #  }
+# # /!\ Render the host key known globally using sshkey { ... }
+# # Now you can expect the clone to work
 # class { 'slurm::repo':
   #     ensure => 'present',
   #     source => 'ssh://git@gitlab.uni.lu:8022/ULHPC/slurm.git',
   #  }
 #
 class slurm::repo(
-  String $ensure   = $slurm::params::ensure,
-  String $provider = 'git',
-  String $basedir  = $slurm::params::repo_basedir,
-  String $path     = '',
-  $source          = undef,
-  String $branch   = 'HEAD',
-  String $syncscript = ''
+  String $ensure     = $slurm::params::ensure,
+  String $provider   = 'git',
+  String $basedir    = $slurm::params::repo_basedir,
+  String $path       = '',
+  $source            = undef,
+  String $branch     = 'HEAD',
+  String $syncscript = '',
+  String $linkdir    = '',
+
 )
 inherits slurm::params
 {
@@ -126,6 +136,15 @@
     revision => $branch,
   }
 
-
+  if !empty($linkdir) {
+    $link_ensure = $ensure ? {
+      'present' => 'link',
+      default   => $ensure
+    }
+    file { $linkdir:
+      ensure => $link_ensure,
+      target => $real_path,
+    }
+  }
 
 }
diff --git a/templates/slurm.conf.erb b/templates/slurm.conf.erb
@@ -210,6 +210,7 @@ AccountingStorageLoc=slurm
 AccountingStorageType=accounting_storage/slurmdbd
 #AccountingStorageUser=
 AccountingStoreJobComment=YES
+AcctGatherEnergyType=acct_gather_energy/<%= scope['slurm::acct_gatherenergytype']%>
 JobAcctGatherFrequency=<%= scope['slurm::jobacctgatherfrequency'] %>
 JobAcctGatherType=jobacct_gather/<%= scope['slurm::jobacctgathertype'] %>
 <% unless scope['slurm::jobacctgatherparams'].empty? -%>
@@ -221,6 +222,8 @@ JobAcctGatherParams=<%= scope['slurm::jobacctgatherparams'] %>
 Licenses=<%= scope['slurm::licenses'] %>
 <% end -%>
 
+
+
 #MaxJobCount=5000
 #MaxStepCount=40000
 MaxTasksPerNode=<%= scope['slurm::maxtaskspernode'] %>