first stab at making puppet figure out info for nagios and munin master

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 64b54d2dddfcd019585ee20b9bf074f11bac1e58..35de8860ac2efbf97d624fcd3e2c65b0f29554cf 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,8 +48,14 @@ node default {
         }
     }
 
-    case $hostname {
-        spohr: {
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        "true": {
+                      include munin-node::master
+        }
+    }
+
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        "true": {
                       include nagios::server
         }
         default: {
@@ -71,9 +77,12 @@ node default {
     }
 
     case $hostname {
-        rietz,klecker,ravel,senfl: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
+    case $hostname {
+        logtest01: { include ferm }
+    }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }
     }