Spencer Krum da3d3f58b2 Remove logic from puppet.conf
We can now use 3.x configuration exclusively. Also we used
$puppet_version which is incorrect, the value is $puppetversion.

Change-Id: I8ddd985d76970ab8937752dd9c2dc6cf4b7d160a
2014-11-25 16:22:20 -08:00

29 lines
627 B
Plaintext

[main]
logdir=/var/log/puppet
vardir=/var/lib/puppet
ssldir=/var/lib/puppet/ssl
rundir=/var/run/puppet
server=puppetmaster.openstack.org
certname=<%= @certname %>
pluginsync=true
basemodulepath = /etc/puppet/modules
environmentpath = /etc/puppet/environments
environmenttimeout = 0
[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
reports=store,puppetdb
<% if @ca_server -%>
ca = false
ca_server = <%= @ca_server %>
<% end -%>
[agent]
report=true
splay=true
runinterval=600