From 2fe207c234119b0c52706670f651d79773bb6713 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Thu, 5 Apr 2012 12:43:28 +0100 Subject: [PATCH] scope variables Signed-off-by: Stephen Gran --- .../lib/puppet/parser/functions/entropy_provider.rb | 4 ++-- .../puppetmaster/lib/puppet/parser/functions/nodeinfo.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb index 52194cbf8..ef73e5dc7 100644 --- 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 deb07d955..5cc6742df 100644 --- 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 -- 2.20.1