diff options
| author | James Turnbull <james@lovedthanlost.net> | 2009-04-06 11:45:23 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-04-06 11:45:23 +1000 |
| commit | 3aedfd8bbcefcdb92af57e4661a360be9aee2716 (patch) | |
| tree | f44e6bd75fca39f2fd6c87e5d0b6e84ee14dd8e0 /lib/puppet/parser/resource | |
| parent | 173b5f0a162d8dd7f72e1cab257069bc65382960 (diff) | |
| parent | a677e26eb1452c08d7724047a18e50f4a654d2cd (diff) | |
| download | puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.tar.gz puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.tar.xz puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet
Diffstat (limited to 'lib/puppet/parser/resource')
| -rw-r--r-- | lib/puppet/parser/resource/param.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/parser/resource/reference.rb | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb index 1a5cfe8fb..7ce58f4c4 100644 --- a/lib/puppet/parser/resource/param.rb +++ b/lib/puppet/parser/resource/param.rb @@ -1,10 +1,14 @@ +require 'puppet/file_collection/lookup' + # The parameters we stick in Resources. class Puppet::Parser::Resource::Param - attr_accessor :name, :value, :source, :line, :file, :add + attr_accessor :name, :value, :source, :add include Puppet::Util include Puppet::Util::Errors include Puppet::Util::MethodHelper + include Puppet::FileCollection::Lookup + def initialize(hash) set_options(hash) requiredopts(:name, :value, :source) diff --git a/lib/puppet/parser/resource/reference.rb b/lib/puppet/parser/resource/reference.rb index a37f8400d..0c28cf0df 100644 --- a/lib/puppet/parser/resource/reference.rb +++ b/lib/puppet/parser/resource/reference.rb @@ -1,7 +1,10 @@ +# A reference to a resource. Mostly just the type and title. require 'puppet/resource/reference' +require 'puppet/file_collection/lookup' # A reference to a resource. Mostly just the type and title. class Puppet::Parser::Resource::Reference < Puppet::Resource::Reference + include Puppet::FileCollection::Lookup include Puppet::Util::MethodHelper include Puppet::Util::Errors |