remove dacs

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 93b79b2..9b3aa43 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 {
@@ -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,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] {
                include ganeti2
        }
 
@@ -98,11 +98,7 @@ node default {
                include named::geodns
        }
 
-       #if $::hostname in [diabelli,nono,tchaikovsky] {
-       #       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
        }