env_var hash validation, version: 0.1.1

deric · Nov 18, 2013 · 4c6174f · 4c6174f
1 parent 2b742ec
commit 4c6174f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppet-mesos'
-version '0.1.0'
+version '0.1.1'
 source 'http://github.com/deric/puppet-mesos'
 author 'Tomas Barton'
 license 'Apache License, Version 2.0'

diff --git a/manifests/slave.pp b/manifests/slave.pp
@@ -32,9 +32,11 @@
   $owner       = $mesos::owner,
   $group       = $mesos::group,
   $conf_dir    = $mesos::conf_dir,
-  $env_var     = undef,
+  $env_var     = {},
 ) inherits mesos {
 
+  validate_hash($env_var)
+
   file { "${conf_dir}/slave.conf":
     ensure  => 'present',
     content => template('mesos/slave.erb'),

diff --git a/templates/slave.erb b/templates/slave.erb
@@ -30,7 +30,7 @@ CHECKPOINT=<%= @checkpoint %>
 
 # slave environment variables
 <% if @env_var %>
-  <% @env_var.each do |key,val| %>
+<% @env_var.each do |key,val| %>
 export <%= key %>="<%= val %>"
-  <% end %>
+<% end %>
 <% end %>