Put lw01,lw02,lw03,lw04,lw09,lw10 into a snapshot_base class and include that also...

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2324e57..a65e7a9 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,10 +7,6 @@
 #   include roles
 #
 class roles {
-       if has_role('nagiosmaster') {
-               include nagios::server
-       }
-
        if has_role('security_mirror') {
                include roles::security_mirror
        }
@@ -19,14 +15,6 @@ class roles {
                include postgres::backup_server
        }
 
-       if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
-               include roles::snapshot
-       }
-
-       if has_role('bgp') {
-               include roles::bgp
-       }
-
        if has_role('postgresql_server') {
                include postgres::backup_source
        }