From: Stephen Gran <steve@lobefin.net>
Date: Mon, 16 Apr 2012 10:15:05 +0000 (+0100)
Subject: try the hiera way of getting this info
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=d7fb8496f111e456de0a76540ffbb7b7a2be98b0

try the hiera way of getting this info

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/resolv/manifests/init.pp b/modules/resolv/manifests/init.pp
index 59f3147f..152e3923 100644
--- a/modules/resolv/manifests/init.pp
+++ b/modules/resolv/manifests/init.pp
@@ -1,5 +1,7 @@
 class resolv {
 
+	$ns = hiera('nameservers')
+
 	file { '/etc/resolv.conf':
 			content => template('resolv/resolv.conf.erb');
 	}
diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index dfea7786..2ca70739 100644
--- 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