4d64868882
This patch ensures that hiera data and puppet modules, and puppet config are copied to the right directory depending on the current puppet version. Since it's possible for the ansible management server and the managed nodes to have different puppet versions, we need to account for the possibility that the source and destination paths might be different. We also don't need to hardcode the various config paths in config or manage environments since we're using the defaults and hardcoding them would make them incorrect for one or the other puppet versions. Change-Id: I164f91f9a7942e8c5f059652634ec1078ae41aae
30 lines
711 B
Django/Jinja
30 lines
711 B
Django/Jinja
[main]
|
|
logdir=/var/log/puppet
|
|
vardir=/var/lib/puppet
|
|
ssldir=/var/lib/puppet/ssl
|
|
rundir=/var/run/puppet
|
|
server={{ puppet_server }}
|
|
certname={{ certname }}
|
|
pluginsync=true
|
|
data_binding_terminus={{ puppet_data_binding_terminus }}
|
|
reports={{ puppet_reports }}
|
|
environmenttimeout=0
|
|
{% if puppet_basemodulepath != '' %}
|
|
basemodulepath = {{ puppet_basemodulepath }}
|
|
{% endif %}
|
|
{% if puppet_environmentpath != '' %}
|
|
environmentpath={{ puppet_environmentpath }}
|
|
{% endif %}
|
|
|
|
[master]
|
|
# These are needed when the puppetmaster is run by passenger
|
|
# and can safely be removed if webrick is used.
|
|
ssl_client_header=SSL_CLIENT_S_DN
|
|
ssl_client_verify_header=SSL_CLIENT_VERIFY
|
|
|
|
[agent]
|
|
report=true
|
|
splay=true
|
|
runinterval=600
|
|
|