Merge pull request #2 from racciari/master

Add global limit parameters

Author: racciari

manifests/init.pp

@@ -70,6 +70,9 @@
   $file_ensure              = $gridinit::params::file_ensure,
   $directory_mode           = $gridinit::params::directory_mode,
   $directory_ensure         = $gridinit::params::directory_ensure,
+  $limit_core_size          = $gridinit::params::limit_core_size,
+  $limit_max_files          = $gridinit::params::limit_max_files,
+  $limit_stack_size         = $gridinit::params::limit_stack_size,
   $no_exec                  = $gridinit::params::no_exec,
 
   $programs                 = {},

manifests/install.pp

@@ -14,7 +14,7 @@
   package { $gridinit::packages_names:
     ensure          => $gridinit::package_ensure,
     allow_virtual   => false,
-    install_options => $package_install_options,
+    install_options => $gridinit::package_install_options,
   }
 
 }

manifests/params.pp

@@ -20,7 +20,7 @@
       $packages_names          = ['openio-gridinit','openio-gridinit-utils']
       $package_install_options = undef
     }
-    default: { fail("osfamily $::osfamily not supported.") }
+    default: { fail("osfamily ${::osfamily} not supported.") }
   }
   $bindir                   = "${prefixdir}/bin"
   $sysconfdir               = '/etc'
@@ -58,6 +58,10 @@
   $file_ensure              = 'file'
   $directory_mode           = '0755'
   $directory_ensure         = 'directory'
+  # Global parameters
+  $limit_core_size          = '-1'
+  $limit_max_files          = '8192'
+  $limit_stack_size         = '256'
   # Others
   $no_exec                  = false
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "openio-gridinit",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "author": "Romain Acciari",
   "summary": "Puppet module for gridinit from OpenIO",
   "license": "Apache-2.0",

templates/gridinit.conf.erb

@@ -1,12 +1,12 @@
 [Default]
 listen=<%= @runstatedir %>/gridinit.sock
 pidfile=<%= @runstatedir %>/gridinit.pid
-uid=root
-gid=root
+uid=<%= scope['gridinit::user'] %>
+gid=<%= scope['gridinit::group'] %>
 working_dir=<%= @runstatedir %>
 
-limit.core_size=-1
-limit.max_files=8192
-limit.stack_size=256
+limit.core_size=<%= @limit_core_size %>
+limit.max_files=<%= @limit_max_files %>
+limit.stack_size=<%= @limit_stack_size %>
 
 include=<%= @sysconfdird %>/*