X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2933d23fa81c6517d7e8394c839b8d533e63bfc6;hb=9ed89ed95202c7f1cd5afff59091b80ca2177528;hp=6b8be82d0a121740f0aafd02791eb98f15764e72;hpb=e004cf0926cc3bdb95c0d71c79cd734b1e1cc806;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 6b8be82d0..2933d23fa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -47,13 +47,9 @@ node default {
 	include tcp_bbr
 	include certregen::client
 
-	if $::lsbdistcodename == squeeze {
-		include roles::udldap::client
-	} else {
-		include roles::pubsub::client
-		class { 'roles::udldap::client':
-			ensure => absent
-		}
+	include roles::pubsub::client
+	class { 'roles::udldap::client':
+		ensure => absent
 	}
 
 	if getfromhash($site::nodeinfo, 'ganeti') {