diff options
author | Markus Roberts <Markus@reality.com> | 2010-09-01 15:21:08 -0700 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2010-09-23 09:15:58 +1000 |
commit | 6f229eea198d85fd1b37ccaaa3e8257c592707e7 (patch) | |
tree | c8edd0ae65c11ed286331adba4df4637f52d64c8 | |
parent | 021d534482dd8edb863cb77d668ac3525362a0a6 (diff) | |
download | puppet-6f229eea198d85fd1b37ccaaa3e8257c592707e7.tar.gz puppet-6f229eea198d85fd1b37ccaaa3e8257c592707e7.tar.xz puppet-6f229eea198d85fd1b37ccaaa3e8257c592707e7.zip |
Minimal fix for #4631 -- set implicit classes as in 0.25.x
This is a minimal fix for #4631 by reversing one part of the refactor for #1903
commit 0d4fd60c7c143cc1f4e4b0f99f359c09cbfbf21e. It fixes the immediate issue
(implicit classes not being added to resources) but leaves open several other
questions which are defered to #4687.
-rw-r--r-- | lib/puppet/parser/resource.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index 8a5ae886c..e34f284fc 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -93,6 +93,7 @@ class Puppet::Parser::Resource < Puppet::Resource @finished = true add_defaults add_metaparams + add_scope_tags validate end @@ -259,6 +260,12 @@ class Puppet::Parser::Resource < Puppet::Resource end end + def add_scope_tags + if scope_resource = scope.resource + tag(*scope_resource.tags) + end + end + # Accept a parameter from an override. def override_parameter(param) # This can happen if the override is defining a new parameter, rather |