X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fentropy_provider.rb;h=32c413f16324287fa0e696694b54c80177639061;hb=3de5917dacf8547cb4ddf7c563516d8132b47472;hp=fe7606b40aa8e921aafb23e0f472cb93ed08c4e1;hpb=6b536ac623ca0c5c04d6befb2618095130dc10c8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
index fe7606b40..32c413f16 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
@@ -6,13 +6,13 @@ module Puppet::Parser::Functions
       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
-      raise Puppet::ParseError, "entropy_provider: Cannot learn localinfo" unless localinfo
-      raise Puppet::ParseError, "entropy_provider: Cannot learn allnodeinfo" unless allnodeinfo
+      raise Puppet::ParseError, "entropy_provider: Cannot learn nodeinfo" unless nodeinfo and nodeinfo.size > 0
+      raise Puppet::ParseError, "entropy_provider: Cannot learn localinfo" unless localinfo and localinfo.size > 0
+      raise Puppet::ParseError, "entropy_provider: Cannot learn allnodeinfo" unless allnodeinfo and allnodeinfo.size > 0
 
       # find where all the entropy keys are
       provider = []