From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 15 Oct 2019 11:02:26 +0000 (+0200)
Subject: yamlinfo: use different dir to list all nodes
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e50cda3666f187a73d78a32a526c81146b4f1602;p=mirror%2Fdsa-puppet.git

yamlinfo: use different dir to list all nodes

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.
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
index efab0c2e6..6590d6253 100644
--- 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)