Project

General

Profile

« Previous | Next » 

Revision 5326f5ca

Added by Marek Hulán over 7 years ago

Fixes #17886 - move config groups under parameters

(cherry picked from commit 9c39317be1c42bd77b339f81e8dc317dd8704f7c)

View differences:

app/models/host/managed.rb
end
param['foreman_subnets'] = (interfaces.map(&:subnet) + interfaces.map(&:subnet6)).compact.map(&:to_export).uniq
param['foreman_interfaces'] = interfaces.map(&:to_export)
param['foreman_config_groups'] = (config_groups + parent_config_groups).uniq.map(&:name)
param.update self.params
# Parse ERB values contained in the parameters
......
info_hash['parameters'] = param
info_hash['environment'] = param["foreman_env"] if Setting["enc_environment"] && param["foreman_env"]
info_hash['foreman_config_groups'] = (config_groups + parent_config_groups).uniq.map(&:name)
info_hash
end
test/models/host_test.rb
host = FactoryGirl.build(:host)
host.config_groups = [config_groups(:one)]
enc = host.info
assert_includes(enc.keys, 'foreman_config_groups')
assert_includes(enc['foreman_config_groups'], 'Monitoring')
assert_includes(enc['parameters'].keys, 'foreman_config_groups')
assert_includes(enc['parameters']['foreman_config_groups'], 'Monitoring')
end
test "#info ENC YAML contains parent hostgroup config_groups" do
......
host.config_groups = [config_groups(:one)]
hostgroup.config_groups = [config_groups(:two)]
enc = host.info
assert_equal(enc['foreman_config_groups'], ['Monitoring', 'Security'])
assert_equal(enc['parameters']['foreman_config_groups'], ['Monitoring', 'Security'])
end
describe 'cloning' do

Also available in: Unified diff