From c09f991dda8ed9024956ec659255d4b82d3b9804 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 11 Mar 2014 15:57:13 -0300 Subject: Fix munin management when not on main master --- manifests/subsystem/monitor/master.pp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'manifests/subsystem') diff --git a/manifests/subsystem/monitor/master.pp b/manifests/subsystem/monitor/master.pp index 8263a2a..046143b 100644 --- a/manifests/subsystem/monitor/master.pp +++ b/manifests/subsystem/monitor/master.pp @@ -18,7 +18,10 @@ class nodo::subsystem::monitor::master { ensure => $ensure, path => "/var/lib/puppet/modules/munin/nodes/00-performance", content => "max_graph_jobs 1\n max_cgi_graph_jobs 1\nfork no\n", - require => Concatenated_file['/etc/munin/munin.conf'], + require => $main ? { + true => Concatenated_file['/etc/munin/munin.conf'], + default => undef, + }, } # @@ -48,7 +51,10 @@ class nodo::subsystem::monitor::master { ensure => $ensure, path => "/var/lib/puppet/modules/munin/nodes/00-rrdcache", content => "rrdcached_socket /var/run/rrdcached.sock\n", - require => Concatenated_file['/etc/munin/munin.conf'], + require => $main ? { + true => Concatenated_file['/etc/munin/munin.conf'], + default => undef, + }, } if $main == true { -- cgit v1.2.3