diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-02-18 00:29:21 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-02-18 00:29:21 -0200 |
| commit | 3153fb747271971dd310ab902b8958b9f3ea4ecf (patch) | |
| tree | fa2821f6abbface78370e1b1e7781ac48980fe4d | |
| parent | 3e3883887b00961a52f94a8757274557c4c42563 (diff) | |
| download | puppet-nodo-3153fb747271971dd310ab902b8958b9f3ea4ecf.tar.gz puppet-nodo-3153fb747271971dd310ab902b8958b9f3ea4ecf.tar.bz2 | |
Trying to fix munin definitions (3)
| -rw-r--r-- | manifests/init.pp | 10 | ||||
| -rw-r--r-- | manifests/munin.pp | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 8e84900..3e5fd23 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,7 +27,7 @@ class nodo { # We include munin configuration if it's not defined by # and exported resource. - if !defined(Munin[$hostname]) { + if !defined(Munin_node[$hostname]) { include munin::client } @@ -145,10 +145,6 @@ class nodo::server inherits nodo { $sshd_listen_address = [ "$ipaddress" ] include sshd - # Munin - #$munin_port = "4901" - #include munin::client - backupninja::sys { "sys": ensure => present, } @@ -186,7 +182,7 @@ class nodo::vserver inherits nodo { } # Apply munin configuration for this node - Munin <| tag == $name |> + Munin_node <| tag == $name |> # Define a vserver instance define instance($context, $ensure = 'running', $proxy = false, $puppetmaster = false, $gitd = false, @@ -221,7 +217,7 @@ class nodo::vserver inherits nodo { } # Create a munin virtual resource to be realized in the node - @munin { "$name": + @munin_node { "$name": id => $id, tag => $name, } diff --git a/manifests/munin.pp b/manifests/munin.pp index 461a863..7c77dac 100644 --- a/manifests/munin.pp +++ b/manifests/munin.pp @@ -1,5 +1,5 @@ # Define a munin node with custom port -define munin($type, $id) { +define munin_node($type, $id) { # Use one port for each node $munin_port = "59$id" include munin::client |