X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fyamlinfo.rb;h=6590d62530d4bb5383ae0ca65a27c0ff26b45109;hb=e50cda3666f187a73d78a32a526c81146b4f1602;hp=5839b7518b7fd995c4083ad1a60a65af44fda114;hpb=404edcd3bddf15af30b55ff0d76eb2e2d9f5a970;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
index 5839b7518..6590d6253 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
@@ -23,10 +23,6 @@ module Puppet::Parser::Functions
         end
       end
 
-      results['mail_port']      = ''
-      results['smarthost']      = ''
-      results['heavy_exim']     = ''
-
       if yaml['host_settings'].kind_of?(Hash)
         yaml['host_settings'].each_pair do |property, values|
           if values.kind_of?(Hash)
@@ -46,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)