Permalink
Browse files

Merge branch 'puppetlabs-master'

  • Loading branch information...
2 parents d13bee6 + f50fc9c commit 1cbaf48a485b109b77ea5bb037180821812464e7 Dan Bode committed Aug 11, 2011
Showing with 2 additions and 3 deletions.
  1. +2 −3 lib/rspec-puppet/support.rb
@@ -1,5 +1,5 @@
module RSpec::Puppet
- module Support
+ module Support
def build_catalog nodename, facts_val
node_obj = Puppet::Node.new(nodename)
@@ -9,8 +9,7 @@ def build_catalog nodename, facts_val
if Puppet::Resource::Catalog.respond_to? :find
Puppet::Resource::Catalog.find(node_obj.name, :use_node => node_obj)
else
- require 'puppet/face'
- Puppet::Face[:catalog, :current].find(node_obj.name, :use_node => node_obj)
+ Puppet::Resource::Catalog.indirection.find(node_obj.name, :use_node => node_obj)
end
end
end

0 comments on commit 1cbaf48

Please sign in to comment.