yamlinfo: use different dir to list all nodes
authorPeter Palfrader <peter@palfrader.org>
Tue, 15 Oct 2019 11:02:26 +0000 (13:02 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 15 Oct 2019 11:02:26 +0000 (13:02 +0200)
We used Dir.entries('/var/lib/puppet/yaml/node/') to get a list of all
nodes.  That dir is now empty.  Switch to using
Dir.entries('/var/lib/puppet/yaml/facts/').

Both are probably bad, but yamlinfo() should be phased out in favor of
hiera/puppetdb anyhow, so for now this is a temporary fix.

modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb

index efab0c2..6590d62 100644 (file)
@@ -42,7 +42,7 @@ module Puppet::Parser::Functions
     ret = {}
 
     if host == '*'
     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)
         next unless fname =~ /(.*)\.yaml$/
         host_name = $1
         ret[host_name] = read_yaml.call(yaml, host_name)