Project

General

Profile

« Previous | Next » 

Revision 4d4b84f6

Added by Ohad Levy almost 13 years ago

  • ID 4d4b84f6b722874504f508fa92802f6ddee37c11

fixes #35 - Allow hostgroup nesting for puppet classes and parameters

View differences:

app/models/host.rb
end
def all_puppetclasses
return hostgroup.nil? ? puppetclasses : (hostgroup.puppetclasses + puppetclasses).uniq
return hostgroup.nil? ? puppetclasses : (hostgroup.classes + puppetclasses).uniq
end
# provide information about each node, mainly used for puppet external nodes
......
# read OS parameters
operatingsystem.os_parameters.each {|p| parameters.update Hash[p.name => p.value] } unless operatingsystem.nil?
# read group parameters only if a host belongs to a group
hostgroup.group_parameters.each {|p| parameters.update Hash[p.name => p.value] } unless hostgroup.nil?
parameters.update hostgroup.parameters unless hostgroup.nil?
# and now read host parameters, override if required
host_parameters.each {|p| parameters.update Hash[p.name => p.value] }
return parameters

Also available in: Unified diff