X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=c54244da30b49a38b30f917efe80900a0d53a132;hb=6cd0b2c073d84a7e4ba19161ebee856bcd8d2960;hp=3ccacfe0b76384534e76921fb5b41f77c9d50582;hpb=3f6e5777c3cd8a3e7751a0f96737f9bcad3a906a;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 3ccacfe0b..c54244da3 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 {
@@ -71,9 +71,7 @@ node default {
 
 	if $::kernel == Linux {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -120,7 +118,7 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [chopin,geo3,wieck] {
+	if $::hostname in [geo3,wieck] {
 		include debian-org::radvd
 	}