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

diff --git a/manifests/site.pp b/manifests/site.pp
index f1d2e4d4..4dc9fc99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -36,13 +36,20 @@ node default {
 	include motd
 	include unbound
 	include bacula::client
-
-	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny,rossini,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 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 [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 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' {
@@ -57,7 +64,7 @@ node default {
 		}
 	}
 
-	if $::hostname == 'beethoven' {
+	if $::hostname == 'backuphost' {
 		include bacula::storage
 	}
 
@@ -86,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
 	}