X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector%2Fclient.pp;h=09117c66b5c6f0cd867681c3948cfcba098bb005;hb=6ae58e7c927c8ce440ad7eb7728f548c0ff8c754;hp=0dddd271eba2618246a686e170ee980e46a4a53a;hpb=2711ddcacd35d9ff6a262b263babd27d7f6c06d6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director/client.pp b/modules/bacula/manifests/director/client.pp
index 0dddd271e..09117c66b 100644
--- a/modules/bacula/manifests/director/client.pp
+++ b/modules/bacula/manifests/director/client.pp
@@ -2,11 +2,15 @@
 #
 # This is stored config by a client, collected on the director
 #
-# @param port_fd   port that this node's bacula-fd is listening on
-# @param client The name of the client (relevant for device names, media type names, etc.)
+# @param port_fd       port that this node's bacula-fd is listening on
+# @param client        name of the client (relevant for device names, media type names, etc.)
+# @param client_name   bacula client name
+# @param client_secret shared secret between director and client
 define bacula::director::client (
   Integer $port_fd,
-  String $client = $name,
+  Stdlib::Host $client = $name,
+  String $client_name,
+  String $client_secret,
 ) {
   include bacula::director
 
@@ -14,9 +18,6 @@ define bacula::director::client (
   $bacula_ssl_client_cert = $bacula::bacula_ssl_client_cert
   $bacula_ssl_client_key  = $bacula::bacula_ssl_client_key
 
-  $client_name   = "${client}-fd"
-  $client_secret = hkdf('/etc/puppet/secret', "bacula-fd-${client}")
-
   # we define this in both bacula::director::client_from_storage and
   # bacula::director::client and it needs to match.
   $pool_name     = "${bacula::director::pool_name}-${client}"