Merge pull request #1 from racciari/master

Add parameters / Add custom limit

Author: racciari

manifests/init.pp

@@ -76,6 +76,29 @@
 ) inherits gridinit::params {
 
   # Should have some validation here
+  validate_string($project_name)
+  validate_absolute_path($prefixdir)
+  validate_absolute_path($libdir)
+  validate_absolute_path($bindir)
+  validate_absolute_path($sysconfdir)
+  validate_absolute_path($sysconfdird)
+  validate_absolute_path($localstatedir)
+  validate_absolute_path($runstatedir)
+  validate_absolute_path($spoolstatedir)
+  validate_absolute_path($sharedstatedir)
+  validate_absolute_path($logdir)
+  validate_string($exec_ctl)
+  validate_string($user)
+  $valid_user_ensure = ['present','absent','role']
+  validate_re($user_ensure,$valid_user_ensure,"${user_ensure} is invalid.")
+  if type3x($uid) != 'integer' { fail("${uid} is not an integer.") }
+  validate_string($group)
+  $valid_group_ensure = ['present','absent']
+  validate_re($group_ensure,$valid_group_ensure,"${group_ensure} is invalid.")
+  if type3x($gid) != 'integer' { fail("${gid} is not an integer.") }
+  $valid_package_ensure = ['present','installed','absent','purged','held','latest']
+  validate_re($package_ensure,$valid_package_ensure,"${package_ensure} is invalid.")
+  #validate_array($package_names)
 
   create_resources('gridinit::program', $programs)
 

manifests/program.pp

@@ -14,6 +14,7 @@
   $uid           = undef,
   $gid           = undef,
   $env_path      = '/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin',
+  $limit         = {},
   $no_exec       = false,
 ) {
 
@@ -24,6 +25,19 @@
   }
 
   # Should have validation here
+  validate_string($command)
+  validate_bool($enabled)
+  $valid_start_at_boot = ['yes','no']
+  validate_re($start_at_boot,$valid_start_at_boot,"${start_at_boot} is invalid.")
+  $valid_on_die = ['cry','respawn','exit']
+  validate_re($on_die,$valid_on_die,"${on_die} is invalid.")
+  validate_string($group)
+  validate_string($environment)
+  validate_string($uid)
+  validate_string($gid)
+  validate_string($env_path)
+  validate_hash($limit)
+  validate_bool($no_exec)
 
   unless $no_exec {
     $file_notify = [Exec['gridinitctl_reload'],Exec[$name]]

metadata.json

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

templates/program.erb

@@ -13,6 +13,11 @@ gid=<%= @gid %>
 <% if not(@max_files == nil) -%>
 limit.max_files=<%= @options["max_files"] %>
 <% end -%>
+<% if @limit -%>
+<% @limit.each_pair do |k, v| -%>
+limit.<%= k %>=<%= v %>
+<% end -%>
+<% end -%>
 env.PATH=<%= @env_path %>
 <% if not(@environment == nil) -%>
 <% @environment.split(/\s(?=(?:[^"]|"[^"]*")*$)/).each do |item| -%>