X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=a4445ee9b5f44e83c0cf9f3cc6dc75ecd7ca1205;hb=bf716a4daf9652bc9d1b77deac83a2b384fd78bc;hp=583ad92dbaffe1f600306a9b868e44925a12b055;hpb=b9291c6881cb7ac5f90b3329955f61792ba6ee04;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 583ad92db..a4445ee9b 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -45,35 +45,10 @@ class roles {
 		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 +57,6 @@ class roles {
 		include roles::ports_master
 	}
 
-	if has_role('onionbalance') {
-		include onion::balance
-	}
 	if has_role('bgp') {
 		include roles::bgp
 	}
@@ -96,8 +68,4 @@ class roles {
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}
-
-	if has_role('popcon') {
-		include roles::popcon
-	}
 }