Create client name and secret in the fd and ship

[mirror/dsa-puppet.git] / modules / bacula / manifests / director / client.pp

diff --git a/modules/bacula/manifests/director/client.pp b/modules/bacula/manifests/director/client.pp
index 0dddd27..16ce4f5 100644 (file)
--- 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,
+  String $client_name = "${client}-fd", # XXX remove default
+  String $client_secret = hkdf('/etc/puppet/secret', "bacula-fd-${client}"), # XXX remove default
 ) {
   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}"