X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=7d4addb25e274adf9ce676dba75d25c86b4c435c;hb=69f0b861e58644fba443ececeb29eb03cca333dc;hp=01065f00339e4ea04b7556679ce08d0c48311afa;hpb=eb2e4b41e392dd98833ce6d25a5823376058c38b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 01065f003..7d4addb25 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -49,10 +49,6 @@ class roles {
 		include roles::syncproxy
 	}
 
-	if has_role('mailrelay') {
-		include roles::mailrelay
-	}
-
 	if has_role('dns_primary') {
 		include roles::dns_primary
 	}
@@ -61,14 +57,6 @@ class roles {
 		include roles::dns_geodns
 	}
 
-	if has_role('rtmaster') {
-		include roles::rtmaster
-	}
-
-	if has_role('udd') {
-		include roles::udd
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -82,14 +70,6 @@ class roles {
 		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
 	}
@@ -108,8 +88,4 @@ class roles {
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}
-
-	if has_role('popcon') {
-		include roles::popcon
-	}
 }