X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3d46f4ee0c6ea8ae0022611018750a7f455e377d;hb=6a241b85739d81b1ac15dec53d775856d6883f14;hp=ab6fd7dc66a8265d5a0c54883a4fd1e6a073161a;hpb=f66bb1737890b64acd529dfc23e8fd8e5b7d59bf;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index ab6fd7dc6..3d46f4ee0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,6 +39,7 @@ node default {
 	include autofs
 	include lvm
 	include multipath
+	include roles::pubsub::client
 
 	if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
 		include ganeti2
@@ -86,14 +87,9 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [ravel,senfl,orff,diamond,rietz,denis] {
-		include named::authoritative
-	} elsif $::hostname in [geo1,geo2,geo3] {
+	if $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
 	}
-	if $::hostname in [orff, denis] {
-		include dnsextras::entries
-	}
 
 	if $::hostname in [diabelli,nono] {
 		include dacs