aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/role/master.pp5
-rw-r--r--manifests/subsystem/monitor/master.pp10
2 files changed, 13 insertions, 2 deletions
diff --git a/manifests/role/master.pp b/manifests/role/master.pp
index a595d9b..29c85ee 100644
--- a/manifests/role/master.pp
+++ b/manifests/role/master.pp
@@ -32,6 +32,11 @@ class nodo::role::master {
host { "puppet":
ensure => absent,
}
+
+ # Quick and dirty way to keep munin disabled
+ package { 'munin':
+ ensure => purged,
+ }
}
# These should be included after puppetmaster
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 {