X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9e0b813c2d6afc9e490a07f02d59651ff2e6fc45;hb=9832c152effec5117fcaa31f74cf5a3142f0b8fe;hp=3d46f4ee0c6ea8ae0022611018750a7f455e377d;hpb=2c62001610ba34a92b56c5abcc0145eee7d355be;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 3d46f4ee0..9e0b813c2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,13 +39,19 @@ node default {
 	include autofs
 	include lvm
 	include multipath
-	include roles::pubsub::client
+	if $::lsbdistcodename == squeeze {
+		include roles::udldap::client
+	} else {
+		include roles::pubsub::client
+		class { 'roles::udldap::client':
+			ensure => absent
+		}
+	}
 
 	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
 	}
 
-
 	if $::hostname == 'dinis' {
 		include bacula::director
 	} else {
@@ -91,9 +97,9 @@ node default {
 		include named::geodns
 	}
 
-	if $::hostname in [diabelli,nono] {
-		include dacs
-	}
+	#if $::hostname in [diabelli,nono,tchaikovsky] {
+	#	include dacs
+	#}
 
 	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
 		include nfs-server