lib/kafo/configuration.rb in kafo-0.5.2 vs lib/kafo/configuration.rb in kafo-0.5.3
- old
+ new
@@ -121,13 +121,13 @@
private
def includes
modules.map do |mod|
- params_file = File.join(KafoConfigure.modules_dir, modules.first.dir_name, 'manifests', 'params.pp')
+ params_file = File.join(KafoConfigure.modules_dir, mod.params_path)
@logger.debug "checking presence of #{params_file}"
- File.exist?(params_file) ? "include #{mod.dir_name}::params" : nil
- end.compact.join(' ')
+ File.exist?(params_file) ? "include #{mod.dir_name}::#{mod.params_class_name}" : nil
+ end.uniq.compact.join(' ')
end
def params
params = modules.map(&:params).flatten
params = params.select { |p| p.default != 'UNSET' }