diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-07-09 01:43:41 +1000 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-09 09:31:56 -0700 |
| commit | dda165af210c598715c2cf50ba29f8466a589687 (patch) | |
| tree | 64ebac98ad784c1294bdbb9cab7f9bc37f1497c2 | |
| parent | 1715f3af5db3459c373358fe5ab1ab3b793f7045 (diff) | |
| download | puppet-dda165af210c598715c2cf50ba29f8466a589687.tar.gz puppet-dda165af210c598715c2cf50ba29f8466a589687.tar.xz puppet-dda165af210c598715c2cf50ba29f8466a589687.zip | |
Fixed #4180 - Updated old module structure to match correct default
Thanks to Daniel Grafe for the patch
| -rw-r--r-- | lib/puppet/indirector/facts/facter.rb | 2 | ||||
| -rwxr-xr-x | 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 b5787ddf6..75c6529ca 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 ea68f63d6..a6dd8868d 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") |