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 46becc707a9ba88b902302c7450f810760fa149c..10156252372129119ce4fc196e9a4b32c3bd16d4 100644 (file)
--- 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 a718c812333fbb225a61e0e24ec7f061c6782a8a..3879e076f78488bc5a0f1bc7f7a9a038f0fe7d20 100644 (file)
--- 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
        }