Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  we want the output

diff --git a/manifests/site.pp b/manifests/site.pp
index 775c6a1752a37c9c902f1ed15891998ad5121b11..e00a87d032b0159df85750a2dfea134307c77c74 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,6 +35,7 @@ node default {
        include resolv
        include roles
        include unbound
+       include bacula::client
 
        if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
                include ganeti2
@@ -44,10 +45,6 @@ node default {
                include bacula::director
        }
 
-       if $::hostname in [berlioz, biber, draghi, widor, wolkenstein] {
-               include bacula::client
-       }
-
        if $::hostname == 'beethoven' {
                include bacula::storage
        }