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 7eedbf5..8c33181 100644 (file)
--- 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 38f13ac..0be7a28 100644 (file)
--- 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 -%>