X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=3088d1e5c8e432ee13ec1177643d4479ae12ee5e;hb=1a22a9a4b1d7bb3c8bd1fc9041a5edf37b93232d;hp=0abfd9baaef8e7a1435d60a54e026ccfccbe5ed4;hpb=60abc62b4de8b4d30645ca23a8201914ddf1e72e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 0abfd9baa..3088d1e5c 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -49,70 +49,18 @@ class roles {
 		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('security_tracker') {
-		include roles::security_tracker
-	}
-
-	if has_role('rtmaster') {
-		include roles::rtmaster
-	}
-
-	if has_role('udd') {
-		include roles::udd
-	}
-
-	if has_role('sso') {
-		include roles::sso
-	}
-
-	if has_role('sso_rp') {
-		include roles::sso_rp
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
 
-
-	if has_role('qamaster') {
-		ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
-	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
 	}
 
-	if has_role('snapshot_web') {
-		include roles::snapshot_web
-	}
-
-	if has_role('snapshot_shell') {
-		include roles::snapshot_shell
-	}
-
 	if has_role('ports_master') {
 		include roles::ports_master
 	}
 
-	if has_role('onionbalance') {
-		include onion::balance
-	}
 	if has_role('bgp') {
 		include roles::bgp
 	}
@@ -124,8 +72,4 @@ class roles {
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}
-
-	if has_role('popcon') {
-		include roles::popcon
-	}
 }