diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | manifests/init.pp | 12 | ||||
| -rw-r--r-- | manifests/munin.pp | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.swp diff --git a/manifests/init.pp b/manifests/init.pp index 15bbf90..9820b10 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(Nodo::vserver::munin[$hostname]) { + if !defined(Munin[$hostname]) { include munin::client } @@ -185,14 +185,8 @@ class nodo::vserver inherits nodo { dohwinfo => false, } - define munin($type, $id) { - # Use one port for each node - $munin_port = "59$id" - include munin::client - } - # Apply munin configuration for this node - Nodo::vserver::munin <| tag == $name |> + Munin <| tag == $name |> # Define a vserver instance define instance($context, $ensure = 'running', $proxy = false, $puppetmaster = false, $gitd = false, @@ -227,7 +221,7 @@ class nodo::vserver inherits nodo { } # Create a munin virtual resource to be realized in the node - @nodo::vserver::munin { + @munin { id => $id, tag => $name, } diff --git a/manifests/munin.pp b/manifests/munin.pp new file mode 100644 index 0000000..461a863 --- /dev/null +++ b/manifests/munin.pp @@ -0,0 +1,6 @@ +# Define a munin node with custom port +define munin($type, $id) { + # Use one port for each node + $munin_port = "59$id" + include munin::client +} |