From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Sep 2019 09:18:11 +0000 (+0200)
Subject: sd and fd look up hostnames, so start them only after the network is online -a
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=69a42e4c538f99ba4882bc5ea89a4b687b8bc51c

sd and fd look up hostnames, so start them only after the network is online -a
---

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 8890cb785..3837699a2 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -85,6 +85,13 @@ class bacula::client(
     enable    => $service_enable,
     hasstatus => true,
   }
+  dsa_systemd::override { 'bacula-fd':
+    ensure  => $ensure,
+    content => @(EOF),
+      [Unit]
+      After=network-online.target
+      | EOF
+  }
 
   exec { 'bacula-fd restart-when-idle':
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 0a445e0fe..a9dc5651b 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -26,6 +26,8 @@ class bacula::storage (
   }
   dsa_systemd::override { 'bacula-sd':
     content => @(EOT)
+      [Unit]
+      After=network-online.target
       [Service]
       Group=bacula
       SupplementaryGroups=ssl-cert