Revision 1470cb16
Added by Ohad Levy about 12 years ago
- ID 1470cb16868d56e271bfeaae79fbaa0e9032b65a
app/models/host.rb | ||
---|---|---|
info_hash = {}
|
||
info_hash['classes'] = self.puppetclasses_names
|
||
info_hash['parameters'] = param
|
||
info_hash['environment'] = param["foreman_env"]
|
||
info_hash['environment'] = param["foreman_env"] if Setting["enc_environment"]
|
||
|
||
return info_hash
|
||
end
|
lib/foreman/default_settings/loader.rb | ||
---|---|---|
set('using_storeconfigs', "Foreman is sharing its database with Puppet Store configs", (!Puppet.settings.instance_variable_get(:@values)[:master][:dbadapter].empty? rescue false)),
|
||
set('Default_variables_Lookup_Path', "The Default path in which Foreman resolves host specific variables", ["fqdn", "hostgroup", "os", "domain"]),
|
||
set('Enable_Smart_Variables_in_ENC', "Should the smart variables be exposed via the ENC yaml output?", true),
|
||
set('enc_environment', "Should Foreman provide puppet environment in ENC yaml output? (this avoids the mismatch error between puppet.conf and ENC environment)", true),
|
||
set('update_environment_from_facts', "Should Foreman update a host's environment from its facts", false)
|
||
].compact.each { |s| create s.update(:category => "Puppet")}
|
||
end
|
Also available in: Unified diff
fixes #1530 - Disabling puppet env in ENC is now a configurable.