From 153d7cd69b8b5216695206cbc235dd89a65dec76 Mon Sep 17 00:00:00 2001 From: Brice Figureau Date: Sat, 24 Apr 2010 17:41:01 +0200 Subject: Fix #3665 - part 2, node inheritance fixes We were looking only to the class hierarchies when trying to find an ancestor to the current type. Thus we were never trying to climb up the hierarchy of nodes when evaluating nodes. Signed-off-by: Brice Figureau --- lib/puppet/resource/type.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb index 825cce39e..cb87cc44f 100644 --- a/lib/puppet/resource/type.rb +++ b/lib/puppet/resource/type.rb @@ -178,7 +178,7 @@ class Puppet::Resource::Type return nil unless parent unless @parent_type ||= resource_type_collection.send(type, parent) - fail Puppet::ParseError, "Could not find parent resource type '#{parent}'" + fail Puppet::ParseError, "Could not find parent resource type '#{parent}' of type #{type}" end @parent_type @@ -219,12 +219,14 @@ class Puppet::Resource::Type if caller_name = scope.parent_module_name and ! set.include?(:caller_module_name) scope.setvar("caller_module_name", caller_name) end - scope.class_set(self.name,scope) if hostclass? + scope.class_set(self.name,scope) if hostclass? or node? end # Create a new subscope in which to evaluate our code. def subscope(scope, resource) - scope.newscope :resource => resource, :namespace => self.namespace, :source => self + scope = scope.newscope :resource => resource, :namespace => self.namespace, :source => self + scope.nodescope = true if @type == :node + scope end # Check whether a given argument is valid. @@ -261,8 +263,7 @@ class Puppet::Resource::Type end def evaluate_parent_type(resource) - #return unless klass = parent_type and parent_resource = resource.scope.compiler.catalog.resource(:class, klass.name) - return unless klass = parent_type and parent_resource = resource.catalog.resource(:class, klass.name) + return unless klass = parent_type and parent_resource = resource.scope.compiler.catalog.resource(:class, klass.name) || resource.scope.compiler.catalog.resource(:node, klass.name) parent_resource.evaluate unless parent_resource.evaluated? return parent_scope(resource.scope, klass) end -- cgit