From e4f56ddf7fbb81d1c53a9cc5dce75e0d2b8d7988 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 15 Apr 2013 07:37:30 +0100 Subject: [PATCH 1/1] get nameserver list from hiera Signed-off-by: Stephen Gran --- .../puppetmaster/lib/puppet/parser/functions/nodeinfo.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb index b9d74ee4..745ad05b 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb @@ -39,15 +39,16 @@ module Puppet::Parser::Functions end end - if not nodeinfo['hoster']['nameservers'] or nodeinfo['hoster']['nameservers'].empty? + ns = function_hiera('nameservers') + if not ns or ns.empty? # no nameservers known for this hoster nodeinfo['misc']['resolver-recursive'] = true if nodeinfo['hoster']['allow_dns_query'] raise Puppet::ParseError, "No nameservers listed for #{nodeinfo['hoster']['name']} yet we should answer somebody's queries? That makes no sense." end - elsif (nodeinfo['misc']['v4addrs'] and (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v4addrs']).size > 0) or - (nodeinfo['misc']['v6addrs'] and (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v6addrs']).size > 0) + elsif (nodeinfo['misc']['v4addrs'] and (ns & nodeinfo['misc']['v4addrs']).size > 0) or + (nodeinfo['misc']['v6addrs'] and (ns & nodeinfo['misc']['v6addrs']).size > 0) # this host is listed as a nameserver at this location nodeinfo['misc']['resolver-recursive'] = true -- 2.39.2