1 files changed, 6 insertions, 9 deletions
diff --git a/lib/puppet/indirector/yaml.rb b/lib/puppet/indirector/yaml.rb
index c7c053f4b..23997e97a 100644
--- a/lib/puppet/indirector/yaml.rb
+++ b/lib/puppet/indirector/yaml.rb
@@ -41,19 +41,16 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
     end
   end
 
-  # Get the yaml directory
-  def base
-    Puppet.run_mode.master? ? Puppet[:yamldir] : Puppet[:clientyamldir]
-  end
-
   # Return the path to a given node's file.
-  def path(name)
-    File.join(base, self.class.indirection_name.to_s, name.to_s + ".yaml")
+  def path(name,ext='.yaml')
+    base = Puppet.run_mode.master? ? Puppet[:yamldir] : Puppet[:clientyamldir]
+    File.join(base, self.class.indirection_name.to_s, name.to_s + ext)
   end
 
-  # Do a glob on the yaml directory, loading each file found
   def search(request)
-    Dir.glob(File.join(base, self.class.indirection_name.to_s, request.key)).collect { |f| YAML.load_file(f) }
+    Dir.glob(path(request.key,'')).collect do |file|
+      YAML.load_file(file)
+    end
   end
 
   private