From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 27 Feb 2010 18:48:35 +0000 (-0300)
Subject: Introducing $node_hosting_type
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=be6914cef2766b700757845e468ad2415a92eb76;p=puppet-nodo.git

Introducing $node_hosting_type
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 8301bba..e22edbb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -181,12 +181,20 @@ class nodo::vserver inherits nodo {
     dohwinfo   => false,
   }
 
-  # Apply munin configuration for this node
-  Munin_node <<| title == $hostname |>>
+  $hosting_type = $node_hosting_type ? {
+    ''      => "direct",
+    default => "$node_hosting_type",
+  }
+
+  if $hosting_type == "direct" {
+    # Apply munin configuration for this node for
+    # directly hosted nodes.
+    Munin_node <<| title == $hostname |>>
+  }
 
-  # We include munin configuration in case the node wasn't defined
-  # by nodo::vserver::instance.
-  if !defined(munin::client) {
+  if $hosting_type == "third-party" {
+    # Apply munin configuration for this node for third-party
+    # hosted nodes.
     munin_node { "$hostname": }
   }