From 0829cf1309d0027fae1227bd54c7efe4ae280191 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 7 Mar 2014 18:35:57 -0300 Subject: Cleanup on nodo::subsystem::monitor::master --- manifests/subsystem/monitor/master.pp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'manifests/subsystem') diff --git a/manifests/subsystem/monitor/master.pp b/manifests/subsystem/monitor/master.pp index d6f09b7..dc52391 100644 --- a/manifests/subsystem/monitor/master.pp +++ b/manifests/subsystem/monitor/master.pp @@ -7,16 +7,10 @@ class nodo::subsystem::monitor::master { require => Package['nagios'], } - $main = hiera('nodo::role::master::main', false) - - if $main == true { - $ensure = 'present' - $package = 'installed' - $service = 'running' - } else { - $ensure = 'absent' - $package = 'purged' - $service = 'stopped' + $main = hiera('nodo::role::master::main', false) + $ensure = $main ? { + true => 'present', + default => 'absent', } # @@ -25,7 +19,7 @@ class nodo::subsystem::monitor::master { # http://kuszelas.eu/~eyck/log/Howto/Munin.Rrdcached.html # package { 'rrdcached': - ensure => $package, + ensure => $ensure, } file { '/etc/default/rrdcached': @@ -37,8 +31,10 @@ class nodo::subsystem::monitor::master { notify => Service['rrdcached'], } - service { 'rrdcached': - ensure => $service, - require => Package['rrdcached'], + if $main == true { + service { 'rrdcached': + ensure => running, + require => Package['rrdcached'], + } } } -- cgit v1.2.3