X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=3681c3614adbf9f49fd8646642a71b52806dfa2a;hb=ca7579bd093cc5c645dc6db2d014e829e5482fa5;hp=76917a3f72c3440efcd2c287663971c9603bcf5f;hpb=2a226fbac13415d7d7fbb5cbda251c3c528f70ad;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 76917a3f7..3681c3614 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
@@ -70,9 +71,7 @@ node default {
 
 	if $::kernel == Linux {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -103,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
 	}
 
@@ -119,7 +118,7 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
+	if $::hostname in [geo3,wieck] {
 		include debian-org::radvd
 	}
 
@@ -137,3 +136,4 @@ node default {
 		}
 	}
 }
+