Merge pull request #80 from kreczko/kreczko/issue/78+79

Fixing CGroup issue and badly initialized variables
HEP-Puppet · Nov 3, 2017 · 7e71ffe · 7e71ffe
2 parents 46f498f + 9d5f071
commit 7e71ffe
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Puppet module for HTCondor batch system
 
-Latest stable version: https://github.com/HEP-Puppet/htcondor/releases/tag/v2.0.1
+Latest stable version: https://github.com/HEP-Puppet/htcondor/releases/tag/v2.0.3
 
 Development branch: https://github.com/HEP-Puppet/htcondor/tree/development
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -135,8 +135,6 @@
   $partitionable_slots            = $htcondor::params::partitionable_slots,
   $memory_overcommit              = $htcondor::params::memory_overcommit,
   $request_memory                 = $htcondor::params::request_memory,
-  $certificate_mapfile            = $htcondor::params::certificate_mapfile,
-  $kerberos_mapfile               = $htcondor::params::kerberos_mapfile,
   $starter_job_environment        = $htcondor::params::starter_job_environment,
   $pool_home                      = $htcondor::params::pool_home,
   $pool_create                    = $htcondor::params::pool_create,

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "HEPPuppet-htcondor",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "summary": "Puppet module for HTCondor batch system",
   "author": "HEPPuppet",
   "requirements": [

diff --git a/templates/20_workernode.config.erb b/templates/20_workernode.config.erb
@@ -112,7 +112,7 @@ MAX_NUM_STARTD_LOG = 10
 <%- if @enable_cgroup -%>
 # Enable CGROUP
 BASE_CGROUP = <%= @htcondor_cgroup %>
-CGROUP_MEMORY_LIMIT = soft
+CGROUP_MEMORY_LIMIT_POLICY = soft
 <%- end -%>
 
 ## Debugging