X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=da2855b0bd1af8775acc94c8cc94b79511d23263;hb=2c50e8598c18a622f9bc638a404416b48ac92711;hp=13ac0162614ac90130e7b26c200f3637c46a00d7;hpb=1cd5a0fc5ae58049e86911dedbb1f85a6b8e0da0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 13ac01626..da2855b0b 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,11 +7,6 @@
 #   include roles
 #
 class roles {
-
-	if has_role('puppetmaster') {
-		include puppetmaster
-	}
-
 	if has_role('muninmaster') {
 		include munin::master
 	}
@@ -158,11 +153,11 @@ class roles {
 	}
 
 	if has_role('dns_primary') {
-		include named::primary
+		include roles::dns_primary
 	}
 
 	if has_role('dns_geo') {
-		include named::geodns
+		include roles::dns_geodns
 	}
 
 	if has_role('weblog_destination') {
@@ -201,10 +196,6 @@ class roles {
 		include roles::tracker
 	}
 
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -394,8 +385,4 @@ class roles {
 	if has_role('anonscm') {
 		include roles::anonscm
 	}
-
-	if has_role('loghost') {
-		include roles::loghost
-	}
 }