Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet

diff --git a/modules/deprecated/manifests/init.pp b/modules/deprecated/manifests/init.pp
index f29c765..df4a438 100644 (file)
--- a/modules/deprecated/manifests/init.pp
+++ b/modules/deprecated/manifests/init.pp
@@ -3,4 +3,14 @@ class deprecated {
        $localinfo = yamlinfo('*')
        $nodeinfo  = nodeinfo($::fqdn)
        $allnodeinfo = allnodeinfo('sshRSAHostKey ipHostNumber', 'purpose mXRecord physicalHost purpose')
+
+       if ! ($localinfo.size > 0) {
+               fail('Cannot learn localinfo.')
+       }
+       if ! ($nodeinfo.size > 0) {
+               fail('Cannot learn nodeinfo.')
+       }
+       if ! ($allnodeinfo.size > 0) {
+               fail('Cannot learn allnodeinfo.')
+       }
 }

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
index 5c8c6fe..32c413f 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
@@ -10,9 +10,9 @@ module Puppet::Parser::Functions
       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 = []

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
index efab0c2..6590d62 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
@@ -42,7 +42,7 @@ module Puppet::Parser::Functions
     ret = {}
 
     if host == '*'
-      Dir.entries('/var/lib/puppet/yaml/node/').each do |fname|
+      Dir.entries('/var/lib/puppet/yaml/facts/').each do |fname|
         next unless fname =~ /(.*)\.yaml$/
         host_name = $1
         ret[host_name] = read_yaml.call(yaml, host_name)