From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Sep 2019 14:54:18 +0000 (+0200)
Subject: Try to wait for both network-online *and* unbound
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=ebe52fd03fd18b9b0d0b72f54ca9e855ead901a0

Try to wait for both network-online *and* unbound
---

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 75bae98c3..98ea8a6d2 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -100,7 +100,7 @@ class bacula::client(
     ensure  => $ensure,
     content => @(EOF),
       [Unit]
-      After=unbound.service
+      After=network-online.target unbound.service
       [Service]
       ExecStart=
       ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 93e38d812..26ed44fd5 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -63,7 +63,7 @@ class bacula::director(
   dsa_systemd::override { 'bacula-director':
     content => @(EOT)
       [Unit]
-      After=unbound.service
+      After=network-online.target unbound.service
       | EOT
   }
 
diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 4f63f4be0..8128fde45 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -27,7 +27,7 @@ class bacula::storage (
   dsa_systemd::override { 'bacula-sd':
     content => @(EOT)
       [Unit]
-      After=unbound.service
+      After=network-online.target unbound.service
       [Service]
       Group=bacula
       SupplementaryGroups=ssl-cert