Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

fixes 2.7 support #11

Merged
merged 2 commits into from

2 participants

@bodepd
Collaborator

No description provided.

bodepd added some commits
@bodepd bodepd Remove Faces API call.
Previously, used the catalog face for
compilation with the :use_node option.

Starting in 2.7.2rc2, all faces options
must be explicit, so the catalog face
no longer supports the use_node option.

This commit changes the call to use
the indirection directly.
f50fc9c
@bodepd bodepd Merge branch 'puppetlabs-master' 1cbaf48
@rodjek rodjek merged commit 41c07fa into rodjek:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 11, 2011
  1. @bodepd

    Remove Faces API call.

    bodepd authored
    Previously, used the catalog face for
    compilation with the :use_node option.
    
    Starting in 2.7.2rc2, all faces options
    must be explicit, so the catalog face
    no longer supports the use_node option.
    
    This commit changes the call to use
    the indirection directly.
  2. @bodepd
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 3 deletions.
  1. +2 −3 lib/rspec-puppet/support.rb
View
5 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
Something went wrong with that request. Please try again.