X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=0695176a96a7f48e711045ff3324056263cc060c;hb=e200005317ddfcfbd8306fdef71a1e9240d0b123;hp=9b6d45ba715e2bbc2a9defb0ebeeabf2eeed79a8;hpb=6b1461d0ec2d6470003a69e33517e6d231253d81;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9b6d45ba..0695176a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,15 +40,15 @@ node default {
 	include lvm
 	include multipath
 	if $::lsbdistcodename == squeeze {
-		include roles::udlap::client
+		include roles::udldap::client
 	} else {
 		include roles::pubsub::client
-		class { 'roles::udlap::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] {
+	if $::hostname in [pasquini,tristano,bertali,boito,ubc-bl8,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] {
 		include ganeti2
 	}
 
@@ -64,7 +64,7 @@ node default {
 		}
 	}
 
-	if $::hostname == 'backuphost' {
+	if $::hostname == 'storace' {
 		include bacula::storage
 	}
 
@@ -97,18 +97,14 @@ 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] {
+	if $::hostname in [beach,glinka,milanollo,lw01,lw02,lw03,lw04] {
 		include nfs-server
 	}
 
-	if $::hostname == 'vieuxtemps' {
-		include varnish
-	}
-
 	if $::brokenhosts {
 		include hosts
 	}