Put client_port into the stored config

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 34e2b64..7900e9a 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -2,7 +2,9 @@ class bacula::client inherits bacula {
        @@bacula::storage-per-node { $::fqdn: }
 
        if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
-               @@bacula::node { $::fqdn: }
+               @@bacula::node { $::fqdn:
+                       bacula_client_port => $bacula::bacula_client_port,
+               }
        }
 
        package { ['bacula-fd']:

diff --git a/modules/bacula/manifests/node.pp b/modules/bacula/manifests/node.pp
index fbbfbd2..4ee5b40 100644 (file)
--- a/modules/bacula/manifests/node.pp
+++ b/modules/bacula/manifests/node.pp
@@ -1,4 +1,4 @@
-define bacula::node() {
+define bacula::node($bacula_client_port = $bacula::bacula_client_port) {
 
        include bacula
 
@@ -9,7 +9,6 @@ define bacula::node() {
        $bacula_storage_port      = $bacula::bacula_storage_port
        $bacula_storage_secret    = $bacula::bacula_storage_secret
 
-       $bacula_client_port   = $bacula::bacula_client_port
        $bacula_ca_path       = $bacula::bacula_ca_path
        $bacula_ssl_client_cert = $bacula::bacula_ssl_client_cert
        $bacula_ssl_client_key  = $bacula::bacula_ssl_client_key