make czerny a ganeti-node

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

diff --git a/manifests/site.pp b/manifests/site.pp
index a649d902b030f1281c445acf2d091f8d2299acd8..b9382e2606f90e215466b0c42918bd5faffce49a 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,7 +37,7 @@ node default {
        include unbound
        include bacula::client
 
-       if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny] {
                include ganeti2
        }
 
@@ -96,6 +96,10 @@ node default {
                include nfs-server
        }
 
+       if $::hostname == 'vieuxtemps' {
+               include varnish
+       }
+
        if $::brokenhosts {
                include hosts
        }
@@ -110,15 +114,17 @@ node default {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }
 
-       if $::hostname in ['berlioz', 'biber', 'diabelli', 'draghi', 'widor', 'wolkenstein'] {
-               @@bacula::node { $::fqdn: }
-       }
-
        if $::spamd {
                munin::check { 'spamassassin': }
        }
+
+        if $::hoster {
+               if $::hoster in [ynic] {
+                       include lldp
+               }
+       }
 }