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

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 12f334e..3837699 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -34,7 +34,9 @@ class bacula::client(
   }
 
   if $ensure == 'present' {
-    Bacula::Client::Director <<| tag == "bacula::to-fd::${director_server}" |>>
+    Bacula::Client::Director <<| tag == "bacula::to-fd::${director_server}" |>> {
+      before => Exec['bacula-fd restart-when-idle'],
+    }
 
     @@bacula::storage::client { $client:
       tag             => "bacula::to-storage::${storage_server}",
@@ -82,7 +84,13 @@ class bacula::client(
     ensure    => $service_ensure,
     enable    => $service_enable,
     hasstatus => true,
-    require   => Package['bacula-fd']
+  }
+  dsa_systemd::override { 'bacula-fd':
+    ensure  => $ensure,
+    content => @(EOF),
+      [Unit]
+      After=network-online.target
+      | EOF
   }
 
   exec { 'bacula-fd restart-when-idle':
@@ -90,7 +98,7 @@ class bacula::client(
     command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_fd} bacula-fd &'",
     refreshonly => true,
     subscribe   => [ File[$bacula::bacula_ssl_server_cert], File[$bacula::bacula_ssl_client_cert] ],
-    require     => File['/usr/local/sbin/bacula-idle-restart'],
+    require     => [ File['/usr/local/sbin/bacula-idle-restart'], File['/etc/bacula/fd-conf.d/empty.conf'] ],
   }
 
   file { '/etc/bacula/bacula-fd.conf':
@@ -99,7 +107,6 @@ class bacula::client(
     mode    => '0640',
     owner   => root,
     group   => bacula,
-    require => Package['bacula-fd'],
     notify  => Exec['bacula-fd restart-when-idle'],
   }
   file { '/etc/bacula/fd-conf.d/empty.conf':
@@ -107,8 +114,7 @@ class bacula::client(
     content => '',
     mode    => '0440',
     group   => bacula,
-    require => Package['bacula-director-pgsql'],
-    notify  => Exec['bacula-director reload']
+    notify  => Exec['bacula-fd restart-when-idle'],
   }
   file { '/usr/local/sbin/bacula-backup-dirs':
     ensure => $ensure,
@@ -126,7 +132,6 @@ class bacula::client(
     mode    => '0400',
     owner   => root,
     group   => root,
-    require => Package['bacula-fd'],
     notify  => Service['bacula-fd'],
   }
   if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $facts['systemd']) {