From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 24 Sep 2019 20:36:57 +0000 (+0200)
Subject: Give the RestoreFiles Job needs a pool.  any pool.
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b0a589e8cc8b7afc9b24ddeda7761b349f863aba;p=mirror%2Fdsa-puppet.git

Give the RestoreFiles Job needs a pool.  any pool.
---

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 8af23cf35..c86839821 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -15,6 +15,9 @@ class bacula::director(
   Optional[String] $db_sslca = undef,
 ) inherits bacula {
 
+  # the RestoreFiles Job needs a Pool.  Any valid pool.
+  $some_pool_name = "poolfull-${pool_name}-${bacula::bacula_director_address}"
+
   ensure_packages ( [
     'bacula-director-pgsql',
     'bacula-common',
diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index db41540a8..80aef43e5 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -160,7 +160,7 @@ Job {
   Type = Restore
   Client = <%=@bacula_director_address%>-fd
   FileSet = "Standard Set"
-  Pool = poolfull-<%=@bacula_pool_name%>-<%=@bacula_director_address%>
+  Pool = <%= @some_pool_name %>
   Messages = Standard
   Where = /var/tmp/bacula-restores
 }