take hiera out of the params

diff --git a/manifests/init.pp b/manifests/init.pp
index 950598ee33a2fe4bc4d49ed17e2a0dd527c2e5f8..c22c4ea69d8bcc09d38ca645fcc37be33fc09b83 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,7 +12,11 @@
 # the Free Software Foundation.
 #
 
-class resolvconf {
+class resolvconf(
+  $domain = $::domain,  
+  $search = $::domain,
+  $nameservers = [ '8.8.8.8' ]
+) {
   file{'/etc/resolv.conf':
     content => $::operatingsystem ? {
       openbsd => template("resolvconf/resolvconf.${::operatingsystem}.erb"),

diff --git a/templates/resolvconf.OpenBSD.erb b/templates/resolvconf.OpenBSD.erb
index be19f8e91dfa10b51aaef85998298a51cf335bd2..48daf2796f1ad1ab96a28a5bd88a7577565241dc 100644 (file)
--- a/templates/resolvconf.OpenBSD.erb
+++ b/templates/resolvconf.OpenBSD.erb
@@ -1,6 +1,5 @@
 # managed by puppet
 lookup file bind
-<% Puppet::Parser::Functions.function('hiera') -%>
-<% scope.function_hiera('resolvconf_nameservers',['8.8.8.8']).each do |nameserver| -%>
+<% scope.lookupvar('resolvconf::nameservers').each do |nameserver| -%>
 nameserver <%= nameserver %> 
 <% end -%>

diff --git a/templates/resolvconf.erb b/templates/resolvconf.erb
index dc98aead799953cc9ab9e12c2ea3ffb8a00f6484..d8136bfba2a586387202943da22ac453d3e278cf 100644 (file)
--- a/templates/resolvconf.erb
+++ b/templates/resolvconf.erb
@@ -1,8 +1,7 @@
 # managed by puppet
-<% Puppet::Parser::Functions.function('hiera') -%>
-domain <%= scope.function_hiera('resolvconf_domain',domain) %>
-search <%= scope.function_hiera('resolvconf_search',domain) %>
+domain <%= scope.lookupvar('resolvconf::domain') %>
+search <%= scope.lookupvar('resolvconf::search') %>
 
-<% scope.function_hiera('resolvconf_nameservers',['8.8.8.8']).each do |nameserver| -%>
+<% scope.lookupvar('resolvconf::nameservers').each do |nameserver| -%>
 nameserver <%= nameserver %>
 <% end -%>