try the hiera way of getting this info

[dsa-puppet.git] / modules / resolv / templates / resolv.conf.erb

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index dfea77861363010f866fdcb82455bddd1b7aea6d..2ca70739f6a8c2199e11ad24194bccbd5de85128 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -12,7 +12,7 @@ if %w{draghi liszt}.include?(hostname)
   nameservers << "127.0.0.1"
 end
 
-nameservers += scope.lookupvar('site::nodeinfo')['hoster']['nameservers'] if scope.lookupvar('site::nodeinfo')['hoster']['nameservers']
+nameservers += scope.lookupvar('ns')
 searchpaths += scope.lookupvar('site::nodeinfo')['hoster']['searchpaths'] if scope.lookupvar('site::nodeinfo')['hoster']['searchpaths']
 options += scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions'] if scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions']
 
@@ -31,7 +31,7 @@ else
     nameservers << '8.8.4.4'
   end
 
-  nameservers.each do |ns|
+  nameservers.to_a.flatten.each do |ns|
     resolvconf += "nameserver " + ns + "\n"
   end
 end