debug_mirror -> hiera role, first step

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index dcf42e0..f94ebd2 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,25 +15,10 @@ class roles {
                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
        }
-       if has_role('ftp_master') {
-               include roles::ftp_master
-               include roles::dakmaster
-               include roles::signing
-       }
 
        if has_role('security_mirror') {
                include roles::security_mirror
@@ -47,10 +32,6 @@ class roles {
                include roles::snapshot
        }
 
-       if has_role('ports_master') {
-               include roles::ports_master
-       }
-
        if has_role('bgp') {
                include roles::bgp
        }