From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 18 Mar 2017 12:43:09 +0000 (+0100)
Subject: new function call to find hiera objects
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1c732b4f31f2b5ea49881f4d96c1730a5c850cfb;p=mirror%2Fdsa-puppet.git

new function call to find hiera objects

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index cf8ea9dca..71d5ee50e 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -41,8 +41,8 @@ module Puppet::Parser::Functions
         end
       end
 
-      ns = function_hiera(['nameservers'])
-      allow_dns_q = function_hiera(['allow_dns_query'])
+      ns = call_function('hiera',['nameservers'])
+      allow_dns_q = call_function('hiera',['allow_dns_query'])
       if ns.empty?
         # no nameservers known for this hoster
         nodeinfo['misc']['resolver-recursive'] = true