05531f7978
Now that we've finished moving all puppet agents to get triggered from the new master, update their configuration to assume the new server is the default so that we no longer need to override it when running locally from the command line. Change-Id: I446341c5115d948bb8dedbe00e23b38b3e78c62f
40 lines
970 B
Plaintext
40 lines
970 B
Plaintext
[main]
|
|
logdir=/var/log/puppet
|
|
vardir=/var/lib/puppet
|
|
ssldir=/var/lib/puppet/ssl
|
|
rundir=/var/run/puppet
|
|
<% if @puppet_version.to_f < 3.6 -%>
|
|
factpath=$vardir/lib/facter
|
|
templatedir=$confdir/templates
|
|
server=puppetmaster.openstack.org
|
|
certname=<%= @certname %>
|
|
pluginsync=true
|
|
<% end %>
|
|
<% if @puppet_version.to_f >= 3.6 -%>
|
|
basemodulepath = /etc/puppet/modules
|
|
environmentpath = /etc/puppet/environments
|
|
environmenttimeout = 0
|
|
<% end %>
|
|
|
|
|
|
[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
|
|
<% if @puppet_version.to_f < 3.6 -%>
|
|
manifestdir=/opt/config/$environment/manifests
|
|
modulepath=/opt/config/$environment/modules:/etc/puppet/modules
|
|
manifest=$manifestdir/site.pp
|
|
<% end -%>
|
|
reports=store,puppetdb
|
|
<% if @ca_server -%>
|
|
ca = false
|
|
ca_server = <%= @ca_server %>
|
|
<% end -%>
|
|
|
|
[agent]
|
|
report=true
|
|
splay=true
|
|
runinterval=600
|