X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=20da0676e2bed497c4277f55e80431e8e1587a60;hb=e2689b4616131c45947268f1cf00bd4150c2ebd8;hp=a5c0ced31f68847e157ffcabfe87d7cdc15fa375;hpb=ea79efc95ff636a7695165aa8440e013ef52b61a;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a5c0ced31..20da0676e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,7 +37,7 @@ node default {
 	include unbound
 	include bacula::client
 	include autofs
-	include lvm
+	include dsa_lvm
 	include grub
 	include multipath
 	if $::lsbdistcodename == squeeze {
@@ -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,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] {
 		include ganeti2
 	}
 
@@ -71,9 +71,7 @@ node default {
 
 	if $::kernel == Linux {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -104,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] {
 		include nfs-server
 	}
 
@@ -120,7 +118,7 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
+	if $::hostname in [geo3,wieck] {
 		include debian-org::radvd
 	}