scope variables

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

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
index 52194cbf83dd445fd758df4c9ca53721acbac1d1..ef73e5dc7242711584cc19eed2839ef982f67e8b 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
@@ -6,8 +6,8 @@ module Puppet::Parser::Functions
       fqdn = args[0]
       nodeinfo = args[1]
 
-      localinfo = lookupvar('localinfo')
-      allnodeinfo = lookupvar('allnodeinfo')
+      localinfo = lookupvar('site::localinfo')
+      allnodeinfo = lookupvar('site::allnodeinfo')
 
       raise Puppet::ParseError, "entropy_provider: Cannot learn fqdn" unless fqdn
       raise Puppet::ParseError, "entropy_provider: Cannot learn nodeinfo" unless nodeinfo

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index deb07d95537f3e3bf562ccda8224f264d793755e..5cc6742df2455dbb23b2dc100cc8e08010ed1689 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -15,9 +15,9 @@ module Puppet::Parser::Functions
       nodeinfo['hoster'] = function_whohosts(nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml")
 
       nodeinfo['misc'] = {}
-      fqdn = lookupvar('fqdn')
+      fqdn = lookupvar('::fqdn')
       if fqdn and fqdn == host
-        v4ips = lookupvar('v4ips')
+        v4ips = lookupvar('::v4ips')
         if v4ips
           nodeinfo['misc']['v4addrs'] = v4ips.split(',')
 
@@ -26,7 +26,7 @@ module Puppet::Parser::Functions
           nodeinfo['misc']['natted'] = intersection.empty?
         end
 
-        v6ips = lookupvar('v6ips')
+        v6ips = lookupvar('::v6ips')
         if v6ips and v6ips != ""
           nodeinfo['misc']['v6addrs'] = v6ips.split(',')
         end