X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=dc1dee0c1b40fbc82032e7a9a66e84f3173a113d;hb=f7adabc11f4b86313d541b2007570cf3e475320b;hp=87cf8e26599f306eb0a5f0ad888c8e227b411397;hpb=0d03fa1079842ae23ad85de4d3b806e2cf1d9f22;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 87cf8e265..dc1dee0c1 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,10 +7,6 @@
 #   include roles
 #
 class roles {
-	if getfromhash($site::nodeinfo, 'not-bacula-client') {
-		include bacula::not_a_client
-	}
-
 	if has_role('muninmaster') {
 		include munin::master
 	}
@@ -19,11 +15,6 @@ class roles {
 		include nagios::server
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'buildd') {
-		include buildd
-	}
-
 	if has_role('bugs_mirror') {
 		include roles::bugs_mirror
 	}
@@ -125,10 +116,6 @@ class roles {
 		include roles::syncproxy
 	}
 
-	if has_role('static_master') {
-		include roles::static_master
-	}
-
 	if has_role('static_mirror') {
 		include roles::static_mirror
 	} elsif has_role('static_source') {
@@ -214,10 +201,6 @@ class roles {
 		include roles::rtc
 	}
 
-	if has_role('jenkins') {
-		include roles::jenkins
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}