X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=8a09872c7533aa016b42a1ce634db6e018d0e936;hb=468d00478388aea379f1f8dbf9f6e8da8df67afb;hp=a382663e76ced2230d4a80d25f572506f0fad569;hpb=1ef5305a212a75308012f5a29a64223ea04ca5cd;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a382663e7..8a09872c7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,8 +35,9 @@ 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] {
 		include ganeti2
 	}
 
@@ -44,10 +45,6 @@ node default {
 		include bacula::director
 	}
 
-	if $::hostname in [berlioz, biber] {
-		include bacula::client
-	}
-
 	if $::hostname == 'beethoven' {
 		include bacula::storage
 	}
@@ -87,7 +84,7 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile,beach] {
+	if $::hostname in [beethoven,spohr,stabile,beach] {
 		include nfs-server
 	}
 
@@ -109,6 +106,10 @@ node default {
 		include postgres
 	}
 
+	if $::hostname in ['berlioz', 'biber', 'draghi', 'widor', 'wolkenstein'] {
+		@@bacula::node { $::fqdn: }
+	}
+
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}