From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 7 Aug 2018 08:17:05 +0000 (+0200)
Subject: bacula-fd: se ipv6 address from ldap since DNS during boot is icky
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2bc65f1346ee9e0d5e8157aab09ed0e4f487373a;p=mirror%2Fdsa-puppet.git

bacula-fd: se ipv6 address from ldap since DNS during boot is icky
---

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 7eedbf5bc..8c33181b2 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -18,7 +18,6 @@ class bacula::client inherits bacula {
 	package { ['bacula-fd']:
 		ensure => installed
 	}
-	include stretch::network_online
 
 	service { 'bacula-fd':
 		ensure    => running,
@@ -66,8 +65,6 @@ class bacula::client inherits bacula {
 		}
 		systemd::override { 'bacula-fd':
 			content => @(EOT)
-				[Unit]
-				After=network-online.target unbound.service
 				[Service]
 				ExecStart=
 				ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 38f13ac7f..0be7a28d8 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -34,9 +34,9 @@ FileDaemon {
       port = <%= @bacula_client_port %>
     }
     <%- end -%>
-    <%- if scope.lookupvar('site::nodeinfo')['misc']['has_v6_ldap'] -%>
+    <%- scope.lookupvar('site::nodeinfo')['misc']['v6_ldap'].each do |addr| -%>
     ipv6 = {
-      addr = <%= @fqdn %>
+      addr = <%= addr %>
       port = <%= @bacula_client_port %>
     }
     <%- end -%>