remove beach from nfs, add buxtehude instead

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 3ccacfe..3681c36 100644 (file)
--- 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
        }
@@ -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,wieck] {
+       if $::hostname in [geo3,wieck] {
                include debian-org::radvd
        }