nagiosmaster -> hiera role; bind acls still not converted

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3232d50..fb571c5 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,24 +7,6 @@
 #   include roles
 #
 class roles {
-       if has_role('muninmaster') {
-               include munin::master
-       }
-
-       if has_role('nagiosmaster') {
-               include nagios::server
-       }
-
-       # debug archive
-       if has_role('debug_mirror') {
-               include roles::debug_mirror
-       }
-
-       # ftp.debian.org and its ecosystem
-       if has_role('debian_mirror') {
-               include roles::debian_mirror
-       }
-
        if has_role('security_mirror') {
                include roles::security_mirror
        }
@@ -37,10 +19,6 @@ class roles {
                include roles::snapshot
        }
 
-       if has_role('bgp') {
-               include roles::bgp
-       }
-
        if has_role('postgresql_server') {
                include postgres::backup_source
        }