add lldp to ynic hosts

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8b8fe5e4eb420b8848d56a279d425fe19f407c3d..41d88df462434ab0159fc9b46632598d65d601d0 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,17 +35,22 @@ node default {
        include resolv
        include roles
        include unbound
+       include bacula::client
 
-       if $::hostname in [pasquini,tristano,bertali,boito] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
                include ganeti2
        }
 
        if $::hostname == 'dinis' {
                include bacula::director
-       }
+       } else {
+               package { 'bacula-console':
+                       ensure => purged;
+               }
 
-       if $::hostname in [berlioz] {
-               include bacula::client
+               file { '/etc/bacula/bconsole.conf':
+                       ensure => absent;
+               }
        }
 
        if $::hostname == 'beethoven' {
@@ -87,7 +92,7 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
+       if $::hostname in [beethoven,spohr,stabile,beach] {
                include nfs-server
        }
 
@@ -105,11 +110,15 @@ node default {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }
 
        if $::spamd {
                munin::check { 'spamassassin': }
        }
+
+       if $::hoster in [ynic] {
+               include lldp
+       }
 }