ea43e86516
Puppet apply does not add the stdlib lib directory to the $LOAD_PATH.
This is a problem because the puppet_vardir fact requires the
puppet_settings library to be available for the `with_puppet` utility
method.
Without this patch, puppet apply will result in the following error:
$ puppet apply --modulepath=/vagrant/modules -e 'notice $puppet_vardir'
warning: Could not load fact file stdlib/lib/facter/puppet_vardir.rb: no such file to load -- facter/util/puppet_settings
notice: Scope(Class[main]):
notice: Finished catalog run in 0.01 seconds
With this patch applied, puppet apply works as expected:
$ puppet apply --modulepath=/vagrant/modules.pe -e 'notice $puppet_vardir'
notice: Scope(Class[main]): /Users/jeff/.puppet/var
notice: Finished catalog run in 0.01 seconds
This patch defensively tries to load facter/util/puppet_settings. If it cannot
load it, it falls back to trying to explicitly locate and load the library.
Once puppet is fixed such that a modules lib directory is truly in the
$LOAD_PATH, the fall back implementation will no longer be exercised since the
LoadError should not be raised.
21 lines
660 B
Ruby
21 lines
660 B
Ruby
module Facter
|
|
module Util
|
|
module PuppetSettings
|
|
# This method is intended to provide a convenient way to evaluate a
|
|
# Facter code block only if Puppet is loaded. This is to account for the
|
|
# situation where the fact happens to be in the load path, but Puppet is
|
|
# not loaded for whatever reason. Perhaps the user is simply running
|
|
# facter without the --puppet flag and they happen to be working in a lib
|
|
# directory of a module.
|
|
def self.with_puppet
|
|
begin
|
|
Module.const_get("Puppet")
|
|
rescue NameError
|
|
nil
|
|
else
|
|
yield
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|