From: Stephen Gran <steve@lobefin.net>
Date: Sun, 16 Sep 2012 15:21:15 +0000 (+0100)
Subject: move bacula::node export to bacula::client
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=4ed2c73059441caf22a019f4acf51822574708b7;hp=9c2c9e0a88142537050bf99c40dc64696adcf72d

move bacula::node export to bacula::client

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 46becc70..10156252 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -114,10 +114,6 @@ node default {
 		include postgres
 	}
 
-	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
-		@@bacula::node { $::fqdn: }
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index a718c812..3879e076 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,6 +1,10 @@
 class bacula::client inherits bacula {
 	@@bacula::storage-per-node { $::fqdn: }
 
+	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
+		@@bacula::node { $::fqdn: }
+	}
+
 	package { ['bacula-fd']:
 		ensure => installed
 	}