muninmaster -> hiera role, new ssh store/collect, no more plain text munin fetching...

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index de57029..eff82e7 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,24 +7,10 @@
 #   include roles
 #
 class roles {
-       if has_role('muninmaster') {
-               include munin::master
-       }
-
        if has_role('nagiosmaster') {
                include nagios::server
        }
 
-       # archive.debian.org
-       if has_role('historical_mirror') {
-               include roles::historical_mirror
-       }
-
-       # 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
@@ -42,10 +28,6 @@ class roles {
                include roles::snapshot
        }
 
-       if has_role('ports_master') {
-               include roles::ports_master
-       }
-
        if has_role('bgp') {
                include roles::bgp
        }