a8279ecdbf
This enables install_puppet.sh to run successfully on trusty with PUPPET_VERSION=3 set. Add a util directory and a puppetmaster bootstrap shell script. Puppetdb-terminus versions are the same in trusty and precise but are different than the puppet version number. Also puppetdb-terminus isn't present in the puppetlabs repositories. Along with this I have done sufficient testing to use puppet version 3.6 with confidence. Work has been done to enable directory environments as well. Change-Id: I925fa6ac1ed9fc9c0b5e9e616fb071bf7a815436
40 lines
973 B
Plaintext
40 lines
973 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=ci-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
|