X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=091e769bdc195b8248ee0d70b12f35accb25f626;hb=13e495c55be6f08f72739620b0dcbff2b9635474;hp=4d3309c98a33588926db65be77f25e3ae0758327;hpb=599ad0b40f5cb2bc41525af4e5fba5a4a153decb;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 4d3309c98..091e769bd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,7 +37,8 @@ node default {
 	include unbound
 	include bacula::client
 	include autofs
-	include lvm
+	include dsa_lvm
+	include grub
 	include multipath
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
@@ -48,7 +49,7 @@ node default {
 		}
 	}
 
-	if $::hostname in [pasquini,tristano,bertali,boito,dijkstra,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] {
+	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
 	}
 
@@ -70,9 +71,7 @@ node default {
 
 	if $::kernel == Linux {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -90,7 +89,9 @@ node default {
 	}
 
 	if $::apache2 {
-		include apache2
+		if !($::hostname in [oyens]) {
+			include apache2
+		}
 	}
 
 	if $::hostname in [geo1,geo2,geo3] {
@@ -101,7 +102,7 @@ node default {
 	#	include dacs
 	#}
 
-	if $::hostname in [beach,glinka,milanollo,lw01,lw02,lw03,lw04] {
+	if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
 		include nfs-server
 	}
 
@@ -117,7 +118,7 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
+	if $::hostname in [geo3,wieck] {
 		include debian-org::radvd
 	}
 
@@ -135,3 +136,4 @@ node default {
 		}
 	}
 }
+