ftp_master -> hiera role

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3a602be..de57029 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -29,26 +29,11 @@ class roles {
        if has_role('debian_mirror') {
                include roles::debian_mirror
        }
-       if has_role('ftp_master') {
-               include roles::ftp_master
-               include roles::dakmaster
-               include roles::signing
-       }
-       #
-       # security.debian.org
-       if has_role('security_master') {
-               include roles::security_master
-               include roles::dakmaster
-       }
 
        if has_role('security_mirror') {
                include roles::security_mirror
        }
 
-       if has_role('syncproxy') {
-               include roles::syncproxy
-       }
-
        if has_role('postgres_backup_server') {
                include postgres::backup_server
        }
@@ -61,9 +46,6 @@ class roles {
                include roles::ports_master
        }
 
-       if has_role('onionbalance') {
-               include onion::balance
-       }
        if has_role('bgp') {
                include roles::bgp
        }