Project

General

Profile

« Previous | Next » 

Revision c1104d00

Added by Ondřej Ezr about 3 years ago

Fixes #32092 - add puppet safe guard

Hides puppetserver and puppet environment behind macros, that can alter
implementation much more easily and even be patched from plugin.

View differences:

app/views/unattended/provisioning_templates/provision/kickstart_default.erb
os_minor = @host.operatingsystem.minor.to_i
realm_compatible = (@host.operatingsystem.name == 'Fedora' && os_major >= 20) || (rhel_compatible && os_major >= 7)
# safemode renderer does not support unary negation
pm_set = @host.puppetmaster.empty? ? false : true
proxy_uri = host_param('http-proxy') ? "http://#{host_param('http-proxy')}:#{host_param('http-proxy-port')}" : nil
proxy_string = proxy_uri ? " --proxy=#{proxy_uri}" : ''
puppet_enabled = pm_set || host_param_true?('force-puppet')
puppet_enabled = host_puppet_server.present? || host_param_true?('force-puppet')
salt_enabled = host_param('salt_master') ? true : false
chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
section_end = (rhel_compatible && os_major <= 5) ? '' : '%end'

Also available in: Unified diff