Add guard around use of $::hoster, since it comes from our own facts

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 6347a8e94e5ad3234a7899b15c96cf4d280f11ab..bdbdb2823c16697298dd675d95c7577c995ae77a 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] {
                include ganeti2
        }
 
@@ -110,15 +110,17 @@ node default {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }
 
-       if $::hostname in ['berlioz', 'biber', 'draghi', 'widor', 'wolkenstein'] {
-               @@bacula::node { $::fqdn: }
-       }
-
        if $::spamd {
                munin::check { 'spamassassin': }
        }
+
+        if $::hoster {
+               if $::hoster in [ynic] {
+                       include lldp
+               }
+       }
 }