add lldp to ynic hosts

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 71dc640e6b1ec418b7612ebb5b08620b8558a6c2..41d88df462434ab0159fc9b46632598d65d601d0 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,12 +37,20 @@ 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
        }
 
        if $::hostname == 'dinis' {
                include bacula::director
+       } else {
+               package { 'bacula-console':
+                       ensure => purged;
+               }
+
+               file { '/etc/bacula/bconsole.conf':
+                       ensure => absent;
+               }
        }
 
        if $::hostname == 'beethoven' {
@@ -102,15 +110,15 @@ node default {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }
 
-       if $::hostname in ['berlioz.debian.org', 'biber.debian.org', 'draghi.debian.org', 'widor.debian.org', 'wolkenstein.debian.org'] {
-               @@bacula::node { $::fqdn: }
-       }
-
        if $::spamd {
                munin::check { 'spamassassin': }
        }
+
+       if $::hoster in [ynic] {
+               include lldp
+       }
 }