Move bacula::bacula_ssl_{server,client}_{cert,key} to hiera

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

diff --git a/modules/bacula/manifests/director/client_from_storage.pp b/modules/bacula/manifests/director/client_from_storage.pp
index 5be90c3..7b4cb11 100644 (file)
--- a/modules/bacula/manifests/director/client_from_storage.pp
+++ b/modules/bacula/manifests/director/client_from_storage.pp
@@ -9,21 +9,23 @@
 # @param storage_secret          Shared secret between storage and director
 # @param storage_device_name     Device name on the storage daemon for this node's backups
 # @param storage_media_type_name Media type name on the storage daemon for this node's backupse
+# @param volume_retention_full  how long to keep volumes with full backups
+# @param volume_retention_diff  how long to keep volumes with differential backups
+# @param volume_retention_inc   how long to keep volumes with incremental backups
 define bacula::director::client_from_storage (
-  String $storage_address,
+  Stdlib::Host $storage_address,
   Integer $port_sd,
   String $storage_secret,
   String $storage_device_name,
   String $storage_media_type_name,
+  String $volume_retention_full = '100 days', # XXX remove defaults
+  String $volume_retention_diff = '50 days', # XXX remove defaults
+  String $volume_retention_inc  = '30 days', # XXX remove defaults
 
-  String $client = $name,
+  Stdlib::Host $client = $name,
 ) {
   include bacula::director
 
-  $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
-
   # For historical reasons, we use the same string for
   # director-internal storage name as we do for mediate
   # type names.  If we ever blow away the catalog and start