opendev
/
system-config
Code Issues Proposed changes

Merge "Only use environments on the master"

This commit is contained in:
Jenkins 2014-12-12 19:03:14 +00:00 committed by Gerrit Code Review
parent 9bbe33e445 6c947dad34
commit ab3a2571d6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,9 +6,6 @@ rundir=/var/run/puppet
server=puppetmaster.openstack.org
certname=<%= @certname %>
pluginsync=true
basemodulepath = /etc/puppet/modules
environmentpath = /etc/puppet/environments
environmenttimeout = 0
[master]
@ -17,6 +14,9 @@ environmenttimeout = 0
ssl_client_header = SSL_CLIENT_S_DN
ssl_client_verify_header = SSL_CLIENT_VERIFY
reports=store,puppetdb
basemodulepath = /etc/puppet/modules
environmentpath = /etc/puppet/environments
environmenttimeout = 0
<% if @ca_server -%>
ca = false
ca_server = <%= @ca_server %>