opendev/system-config
Code Issues Proposed changes

Only use environments on the master

Browse Source 
Having environment configs on not-master breaks puppet apply. Also,
environments with puppet apply don't make sense.

Change-Id: Ief6c8e9bf7d71ddc63dba484390124546f14b93a
This commit is contained in:
Monty Taylor 2014-12-12 08:13:32 -08:00 committed by Jeremy Stanley
parent 4fda217d25
commit 6c947dad34
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 server=puppetmaster.openstack.org
certname=<%= @certname %> certname=<%= @certname %>
pluginsync=true pluginsync=true
basemodulepath = /etc/puppet/modules
environmentpath = /etc/puppet/environments
environmenttimeout = 0
[master] [master]
@ -17,6 +14,9 @@ environmenttimeout = 0
ssl_client_header = SSL_CLIENT_S_DN ssl_client_header = SSL_CLIENT_S_DN
ssl_client_verify_header = SSL_CLIENT_VERIFY ssl_client_verify_header = SSL_CLIENT_VERIFY
reports=store,puppetdb reports=store,puppetdb
basemodulepath = /etc/puppet/modules
environmentpath = /etc/puppet/environments
environmenttimeout = 0
<% if @ca_server -%> <% if @ca_server -%>
ca = false ca = false
ca_server = <%= @ca_server %> ca_server = <%= @ca_server %>