X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9b3aa43b584fa759bf6e3e6549c4f330fc485b3f;hb=3a36bb2220e5f0d420a23f1de07152cbea63a897;hp=9bb170d9e682d94ade58fef6ad410ecdffbda726;hpb=6832fcf5d8cbc0071e33a54d0c2c186cb3c6c775;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9bb170d9e..9b3aa43b5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -49,7 +49,7 @@ node default {
 		}
 	}
 
-	if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl2,ubc-enc2bl9,ubc-enc2bl10] {
+	if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] {
 		include ganeti2
 	}
 
@@ -98,10 +98,6 @@ node default {
 		include named::geodns
 	}
 
-	#if $::hostname in [diabelli,nono,tchaikovsky] {
-	#	include dacs
-	#}
-
 	if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
 		include nfs-server
 	}