X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=4dc9fc99c161bea83db65e0dcea125c7db77799b;hb=603eba44feb37f8c73b911248bbefbba704943fd;hp=eecf27cd6768e3529a98a41521b0d25b196c6dd4;hpb=683ffc212c9c3a4d7e4a4ff98c94fb52a75a02ca;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index eecf27cd..4dc9fc99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,12 +39,19 @@ node default {
 	include autofs
 	include lvm
 	include multipath
+	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 {