diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-05-16 09:46:22 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-05-16 10:06:54 -0700 |
| commit | 1ad8158da2435126693e02c66d188dd79e71f83d (patch) | |
| tree | 2748c5d5a83546227372726840786dfa94a90645 | |
| parent | 61d732231fa1d23a5e9c32bc38ec9f11430229ba (diff) | |
| download | puppet-1ad8158da2435126693e02c66d188dd79e71f83d.tar.gz puppet-1ad8158da2435126693e02c66d188dd79e71f83d.tar.xz puppet-1ad8158da2435126693e02c66d188dd79e71f83d.zip | |
(#7259) Do not try to load all Terminus classes when configuring the Indirector
When configuring the Indirector routes, we should only try loading the
Terminus classes that are referenced by the configuration.
Previously, we were loading all Terminus classes, which would cause
errors if we didn't have all of the prerequisites for all of them,
even if the ones with missing prerequisites weren't being used by the
configuration.
Paired-with: Nick Lewis <nick@puppetlabs.com>
| -rw-r--r-- | lib/puppet/indirector.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/indirector.rb b/lib/puppet/indirector.rb index 7267ac7f3..86ede5994 100644 --- a/lib/puppet/indirector.rb +++ b/lib/puppet/indirector.rb @@ -18,7 +18,7 @@ module Puppet::Indirector terminus_name = termini["terminus"] cache_name = termini["cache"] - Puppet::Indirector::Terminus.terminus_classes(indirection_name) + Puppet::Indirector::Terminus.terminus_class(indirection_name, terminus_name || cache_name) indirection = Puppet::Indirector::Indirection.instance(indirection_name) raise "Indirection #{indirection_name} does not exist" unless indirection |