X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=adc2795adeeeabcf92951a3d511224366080ea22;hb=18f26a9ca182f25cbdfc4c1532e2d34898295e92;hp=ff29abb1b560621bd03d11ae5c66d25b34a35690;hpb=e91bb90b4afe134e8e1c0781b89650997b1d4960;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ff29abb1b..adc2795ad 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -29,10 +29,6 @@ class roles {
 	if has_role('debian_mirror') {
 		include roles::debian_mirror
 	}
-	if has_role('ftp_master') {
-		include roles::ftp_master
-		include roles::signing
-	}
 
 	if has_role('security_mirror') {
 		include roles::security_mirror
@@ -46,10 +42,6 @@ class roles {
 		include roles::snapshot
 	}
 
-	if has_role('ports_master') {
-		include roles::ports_master
-	}
-
 	if has_role('bgp') {
 		include roles::bgp
 	}