security_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 583ad92..dcf42e0 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,46 +34,15 @@ class roles {
                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('mailrelay') {
-               include roles::mailrelay
-       }
-
-       if has_role('dns_primary') {
-               include roles::dns_primary
-       }
-
-       if has_role('dns_geo') {
-               include roles::dns_geodns
-       }
-
-       if has_role('rtmaster') {
-               include roles::rtmaster
-       }
-
        if has_role('postgres_backup_server') {
                include postgres::backup_server
        }
 
-
-       if has_role('packagesqamaster') {
-               ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
        if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
                include roles::snapshot
        }
@@ -82,9 +51,6 @@ class roles {
                include roles::ports_master
        }
 
-       if has_role('onionbalance') {
-               include onion::balance
-       }
        if has_role('bgp') {
                include roles::bgp
        }
@@ -96,8 +62,4 @@ class roles {
        if $::keyring_debian_org_mirror {
                include roles::keyring_debian_org_mirror
        }
-
-       if has_role('popcon') {
-               include roles::popcon
-       }
 }