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

diff --git a/manifests/site.pp b/manifests/site.pp
index 7b1af9a5..4dc9fc99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,13 +38,18 @@ node default {
 	include bacula::client
 	include autofs
 	include lvm
-
-	if $::hostname in [pasquini,tristano,bertali,boito,rossini,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
+	include multipath
+	if $::lsbdistcodename == squeeze {
+		include roles::udldap::client
+	} else {
+		include roles::pubsub::client
+		class { 'roles::udldap::client':
+			ensure => absent
+		}
 	}
 
-	if $::hostname in [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,rossini,luchesi,dijkstra] {
-		include multipath
+	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' {
@@ -59,7 +64,7 @@ node default {
 		}
 	}
 
-	if $::hostname == 'beethoven' {
+	if $::hostname == 'backuphost' {
 		include bacula::storage
 	}
 
@@ -88,17 +93,15 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
-		include named::authoritative
-	} elsif $::hostname in [geo1,geo2,geo3] {
+	if $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
 	}
 
-	if $::hostname in [diabelli,nono,spohr] {
+	if $::hostname in [diabelli,nono] {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] {
+	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
 		include nfs-server
 	}