attempt to work around puppets crazy scoping

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

diff --git a/files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb
index 6120c1f8345413af52c8a6865d84f4aa63d7a83d..47450d559e65f9ab7670febcdef26cf4b25114ed 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb
@@ -1,6 +1,5 @@
 module Puppet::Parser::Functions
   newfunction(:allnodeinfo, :type => :rvalue) do |attributes|
-    require '/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb'
     attributes.unshift('*')
     return (function_ldapinfo(attributes))
   end

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index fae9d6dd7d11d5f497b745f6f24e29d28359437e..4d915b21bf05e486848d5d1da08eff889be2468b 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -5,7 +5,6 @@ module Puppet::Parser::Functions
     yamlfile = args[1]
 
     require '/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb'
-    require '/etc/puppet/lib/puppet/parser/functions/yamlinfo.rb'
 
     results         = function_yamlinfo(host, yamlfile)
     results['ldap'] = function_ldapinfo(host, '*')

diff --git a/manifests/site.pp b/manifests/site.pp
index ac2723458689af6f58a179254ffe5941074ce157..d5b6ab6c8493b8c42fd7b9dc7b6cdf35979beb4d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,11 +14,11 @@ Exec {
 }
 
 node default {
+    $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
     notice("hoster for ${fqdn} is ${hoster}")
 
-    $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $mxinfo   = allnodeinfo("mXRecord")
 
     include munin-node