diff options
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/resource.rb | 12 | ||||
| -rw-r--r-- | lib/puppet/parser/resource/param.rb | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index af5d10501..d27c8b27e 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -252,27 +252,25 @@ class Puppet::Parser::Resource # with. def store(host) args = {} - %w{type title tags file line exported}.each do |param| + #FIXME: support files/lines, etc. + #%w{type title tags file line exported}.each do |param| + %w{type title tags exported}.each do |param| if value = self.send(param) args[param] = value end end - # 'type' isn't a valid column name, so we have to use something else. args = symbolize_options(args) - args[:restype] = args[:type] - args.delete(:type) # Let's see if the object exists - #if obj = host.rails_resources.find_by_type_and_title(self.type, self.title) - if obj = host.rails_resources.find_by_restype_and_title(self.type, self.title) + if obj = host.resources.find_by_type_and_title(self.type, self.title) # We exist args.each do |param, value| obj[param] = value end else # Else create it anew - obj = host.rails_resources.build(args) + obj = host.resources.build(args) end # Either way, now add our parameters diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb index 600e44781..bcd59573a 100644 --- a/lib/puppet/parser/resource/param.rb +++ b/lib/puppet/parser/resource/param.rb @@ -18,20 +18,22 @@ class Puppet::Parser::Resource::Param # Store this parameter in a Rails db. def store(resource) args = {} - [:name, :value, :line, :file].each do |var| + #FIXME: re-add line/file support + #[:name, :value, :line, :file].each do |var| + [:name, :value ].each do |var| if val = self.send(var) args[var] = val end end args[:name] = args[:name].to_s - if obj = resource.rails_parameters.find_by_name(self.name) + if pname = resource.param_names.find_by_name(self.name) # We exist args.each do |p, v| - obj[p] = v + pname.param_values.build(v) end else # Else create it anew - obj = resource.rails_parameters.build(args) + obj = resource.param_names.build(:name => self.class) end return obj |