Populate master and agent configurations on demand

Currently all settings are populated independently of master
or agent. Add flags for puppetmaster and masterless deploys,
and populate master and agent configs depending on those.

Change-Id: I723388bbcf5e316c6c9b4779462bf1c69353c15b
This commit is contained in:
Yolanda Robla 2015-09-25 16:37:57 +02:00
parent 0ef5e50952
commit 6bf5da341f
2 changed files with 6 additions and 0 deletions

View File

@ -33,6 +33,8 @@ class puppet (
$reports = 'store,puppetdb',
$agent_runinterval = 600,
$puppet_release = $::lsbdistcodename,
$is_master = false,
$is_masterless = false,
) {
# pin facter and puppetdb according to puppet version

View File

@ -20,6 +20,7 @@ server=<%= @puppetmaster_server %>
certname=<%= @certname %>
pluginsync=true
<% if @is_master -%>
[master]
# These are needed when the puppetmaster is run by passenger
# and can safely be removed if webrick is used.
@ -33,7 +34,9 @@ reports=<%= @reports %>
storeconfigs = <%= @store_configs %>
storeconfigs_backend = <%= @store_backend %>
basemodulepath = <%= @basemodule_path %>
<% end %>
<% if ! @is_masterless -%>
[agent]
report=true
splay = true
@ -43,3 +46,4 @@ runinterval = <%= @agent_runinterval %>
http_proxy_host=<%= @agent_http_proxy_host %>
http_proxy_port=<%= @agent_http_proxy_port %>
<% end %>
<% end %>