]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
(#9080) Make facts.d match Facter 2.0
authorJeff McCune <jeff@puppetlabs.com>
Thu, 18 Aug 2011 17:44:40 +0000 (10:44 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 18 Aug 2011 17:44:40 +0000 (10:44 -0700)
Based on feedback from Luke, the facts.d directory should at least match
the directory that will be used by Facter 2.0.

Reading #2157 I believe the Facter 2.0 facts.d feature is reasonably API
compatible with this custom fact from R.I. so I'm comfortable using the
same filesystem path.

Change in behavior:  Now look for facts in:
 * /etc/facter/facts.d
 * /etc/puppetlabs/facter/facts.d

lib/facter/facter_dot_d.rb

index 2e5d865f1f571778ad1968056533fe7ece7bd892..90586a9dc739447c586db1db5071685466fbafd3 100644 (file)
@@ -179,5 +179,5 @@ class Facter::Util::DotD
     end
 end
 
-Facter::Util::DotD.new("/etc/facts.d").create
-Facter::Util::DotD.new("/etc/puppetlabs/facts.d").create
+Facter::Util::DotD.new("/etc/facter/facts.d").create
+Facter::Util::DotD.new("/etc/puppetlabs/facter/facts.d").create