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 <[email protected]>
Signed-off-by: Jacob Helwig <[email protected]>
---

Local-branch: tickets/2.7.x/7259-make-active-record-test-requirement-optional

 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 7267ac7..86ede59 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
-- 
1.7.5.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.

Reply via email to