Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / puppetmaster / lib / puppet / parser / functions / entropy_provider.rb

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
index 9f628cb..5c8c6fe 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
@@ -1,14 +1,13 @@
 module Puppet::Parser::Functions
   newfunction(:entropy_provider, :type => :rvalue) do |args|
     begin
-      require '/var/lib/puppet/lib/puppet/parser/functions/whohosts.rb'
       require 'digest/sha1'
 
       fqdn = args[0]
       nodeinfo = args[1]
 
-      localinfo = lookupvar('site::localinfo')
-      allnodeinfo = lookupvar('site::allnodeinfo')
+      localinfo = lookupvar('deprecated::localinfo')
+      allnodeinfo = lookupvar('deprecated::allnodeinfo')
 
       raise Puppet::ParseError, "entropy_provider: Cannot learn fqdn" unless fqdn
       raise Puppet::ParseError, "entropy_provider: Cannot learn nodeinfo" unless nodeinfo
@@ -22,7 +21,7 @@ module Puppet::Parser::Functions
         next unless  localinfo[node]['entropy_key']
 
         addresses = allnodeinfo[node]['ipHostNumber']
-        thishoster = function_whohosts([addresses, "/etc/puppet/modules/debian_org/misc/hoster.yaml"])
+        thishoster = function_whohosts([addresses])
         name = thishoster['name']
 
         provider << node