Thanks to Daniel Grafe for the patch
Signed-off-by: James Turnbull <[email protected]>
---
lib/puppet/indirector/facts/facter.rb | 2 +-
spec/unit/indirector/facts/facter_spec.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/puppet/indirector/facts/facter.rb
b/lib/puppet/indirector/facts/facter.rb
index b5787dd..75c6529 100644
--- a/lib/puppet/indirector/facts/facter.rb
+++ b/lib/puppet/indirector/facts/facter.rb
@@ -10,7 +10,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
def self.load_fact_plugins
# Add any per-module fact directories to the factpath
module_fact_dirs = Puppet[:modulepath].split(":").collect do |d|
- Dir.glob("%s/*/plugins/facter" % d)
+ Dir.glob("%s/*/lib/facter" % d)
end.flatten
dirs = module_fact_dirs + Puppet[:factpath].split(":")
x = dirs.each do |dir|
diff --git a/spec/unit/indirector/facts/facter_spec.rb
b/spec/unit/indirector/facts/facter_spec.rb
index ea68f63..a6dd886 100755
--- a/spec/unit/indirector/facts/facter_spec.rb
+++ b/spec/unit/indirector/facts/facter_spec.rb
@@ -128,8 +128,8 @@ describe Puppet::Node::Facts::Facter do
Puppet.settings.expects(:value).with(:modulepath).returns("one%stwo" %
File::PATH_SEPARATOR)
- Dir.expects(:glob).with("one/*/plugins/facter").returns %w{oneA
oneB}
- Dir.expects(:glob).with("two/*/plugins/facter").returns %w{twoA
twoB}
+ Dir.expects(:glob).with("one/*/lib/facter").returns %w{oneA oneB}
+ Dir.expects(:glob).with("two/*/lib/facter").returns %w{twoA twoB}
Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("oneA")
Puppet::Node::Facts::Facter.expects(:load_facts_in_dir).with("oneB")
--
1.6.6.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
