diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 15:16:49 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 15:16:49 -0200 |
| commit | 79ffbfb939005205aad40340b74fecfc79cdc463 (patch) | |
| tree | b832ac0ed365c97414e099fbe2f141de288020d2 | |
| parent | 1185aa8141a444d9e3c1b6aa9a38ea21a2ce3ea0 (diff) | |
| download | puppet-nodo-79ffbfb939005205aad40340b74fecfc79cdc463.tar.gz puppet-nodo-79ffbfb939005205aad40340b74fecfc79cdc463.tar.bz2 | |
Switching munin::client to parametrized class
| -rw-r--r-- | manifests/master.pp | 11 | ||||
| -rw-r--r-- | manifests/subsystems/munin.pp | 9 |
2 files changed, 5 insertions, 15 deletions
diff --git a/manifests/master.pp b/manifests/master.pp index 28fbdf1..118e28a 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -7,17 +7,6 @@ class nodo::master { main => true, } - # This is a workaround to correctly set allowed hosts on munin - # client when the host is also present. - # - # Somewhow the inclusion of munin::host makes both $munin_allow - # and $munin_port to get blank. - # - # Right now we don't need to bother with fixing $munin_port as - # we are running the munin host in the main master node but it's - # mandatory to fix $munin_allow so munin can connect into the node. - $munin_allow = hiera('nodo::munin_node::host', '') - include munin::host include munin::plugins::muninhost diff --git a/manifests/subsystems/munin.pp b/manifests/subsystems/munin.pp index a0a534e..a0eb7d9 100644 --- a/manifests/subsystems/munin.pp +++ b/manifests/subsystems/munin.pp @@ -9,10 +9,11 @@ define munin_node( '': { fail("Please set nodo::munin_node::allow in your site config") } } - $munin_port = $port - $munin_allow = $allow - $munin_host = $host + class { 'munin::client': + port => $port, + allow => $allow, + host => $host, + } - include munin::client munin::plugin { apt_all: ensure => present; } } |