no need for the ynic-special lldp module anymore - we put lldp everywhere

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9e0b813..098b96a 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -26,8 +26,7 @@ node default {
        include ssh
        include debian-org
        include monit
-       include ntp
-       include ntpdate
+       include time
        include ssl
        include hardware
        include nagios::client
@@ -37,8 +36,10 @@ node default {
        include unbound
        include bacula::client
        include autofs
-       include lvm
+       include dsa_lvm
+       include grub
        include multipath
+       include popcon
        if $::lsbdistcodename == squeeze {
                include roles::udldap::client
        } else {
@@ -48,7 +49,7 @@ node default {
                }
        }
 
-       if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,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] {
+       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
        }
 
@@ -64,15 +65,13 @@ node default {
                }
        }
 
-       if $::hostname == 'backuphost' {
+       if $::hostname == 'storace' {
                include bacula::storage
        }
 
        if $::kernel == Linux {
                include linux
-               if $::kvmdomain {
-                       include acpi
-               }
+               include acpi
        } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
@@ -97,18 +96,10 @@ node default {
                include named::geodns
        }
 
-       #if $::hostname in [diabelli,nono,tchaikovsky] {
-       #       include dacs
-       #}
-
-       if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
+       if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
                include nfs-server
        }
 
-       if $::hostname == 'vieuxtemps' {
-               include varnish
-       }
-
        if $::brokenhosts {
                include hosts
        }
@@ -121,7 +112,7 @@ node default {
                include samhain
        }
 
-       if $::hostname in [chopin,geo3,soler,wieck] {
+       if $::hostname in [geo3,wieck] {
                include debian-org::radvd
        }
 
@@ -133,9 +124,7 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::hoster {
-               if $::hoster in [ynic] {
-                       include lldp
-               }
+       if $::hostname == 'pkgmirror-csail' {
+               include varnish
        }
 }