Merge branch 'static'

[dsa-puppet.git] / modules / roles / manifests / init.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 20304d2580fb037080503591b36dc6485e5b361e..aaeacee6ab26c052b76236a557dc0d7121cc591b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -8,9 +8,9 @@ class roles {
                include munin::master
        }
 
-       if getfromhash($site::nodeinfo, 'nagiosmaster') {
-               include nagios::server
-       }
+       #if getfromhash($site::nodeinfo, 'nagiosmaster') {
+       #       include nagios::server
+       #}
 
        if getfromhash($site::nodeinfo, 'buildd') {
                include buildd