opendev/system-config
Code Issues Proposed changes

Merge "Remove logic from puppet.conf"

Browse Source
This commit is contained in:
Jenkins 2014-12-09 22:19:04 +00:00 committed by Gerrit Code Review
commit 430e53b23a
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/openstack_project/templates/puppet.conf.erb
View File

@ -3,18 +3,12 @@ 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]
@ -22,11 +16,6 @@ environmenttimeout = 0
# 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/system-config/$environment/manifests
modulepath=/opt/system-config/$environment/modules:/etc/puppet/modules
manifest=$manifestdir/site.pp
<% end -%>
reports=store,puppetdb
<% if @ca_server -%>
ca = false