opendev
/
puppet-puppet
Code Issues Proposed changes

Merge "Populate master and agent configurations on demand"

This commit is contained in:
Jenkins 2015-10-21 03:32:37 +00:00 committed by Gerrit Code Review
parent 90747620e2 6bf5da341f
commit ae414b3f7d
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
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

4
templates/puppet.conf.erb
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 %>