From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 24 Sep 2019 20:42:09 +0000 (+0200)
Subject: explicitly pass client name around
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=973f873a452fdba7a8628d3dc646ab1e5b82e8bd;p=mirror%2Fdsa-puppet.git

explicitly pass client name around
---

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 2b7c35f08..9ac5acb4e 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -21,11 +21,13 @@ class bacula::client(
   if $ensure == 'present' {
     @@bacula::director::client { $::fqdn:
       port_fd => $port_fd,
+      client          => $::fqdn,
       tag     => "bacula::to-director::${director_server}",
     }
 
     @@bacula::storage::client { $::fqdn:
       tag             => "bacula::to-storage::${storage_server}",
+      client          => $::fqdn,
       director_server => $director_server,
     }
 
diff --git a/modules/bacula/manifests/storage/client.pp b/modules/bacula/manifests/storage/client.pp
index 86dd0075d..c8969c0c1 100644
--- a/modules/bacula/manifests/storage/client.pp
+++ b/modules/bacula/manifests/storage/client.pp
@@ -30,8 +30,9 @@ define bacula::storage::client(
   }
 
   # enable the director to make (client, storage) specific configuration
-  @@bacula::director::client_from_storage { "${::fqdn}-${client}":
+  @@bacula::director::client_from_storage { $client:
     tag                     => "bacula::to-director::${director_server}",
+    client                  => $client,
     storage_address         => $::fqdn,
     port_sd                 => $bacula::storage::port_sd,
     storage_secret          => $bacula::storage::storage_secret,