From c439349f1c3acd30786d8687df778b2654a509a0 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 25 Sep 2019 18:37:11 +0200 Subject: [PATCH] Only realize the director-from-client config if the director-from-client-via-storage config is already there --- modules/bacula/manifests/director.pp | 2 +- modules/bacula/manifests/director/client.pp | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp index 26ed44fd5..dd5395df6 100644 --- a/modules/bacula/manifests/director.pp +++ b/modules/bacula/manifests/director.pp @@ -99,8 +99,8 @@ class bacula::director( notify => Exec['bacula-director reload'] } - Bacula::Director::Client <<| tag == "bacula::to-director::${::fqdn}" |>> Bacula::Director::Client_from_storage<<| tag == "bacula::to-director::${::fqdn}" |>> + Bacula::Director::Client <<| tag == "bacula::to-director::${::fqdn}" |>> package { 'bacula-console': ensure => installed; diff --git a/modules/bacula/manifests/director/client.pp b/modules/bacula/manifests/director/client.pp index 0d356a662..f021819f0 100644 --- a/modules/bacula/manifests/director/client.pp +++ b/modules/bacula/manifests/director/client.pp @@ -22,11 +22,14 @@ define bacula::director::client ( # bacula::director::client and it needs to match. $pool_name = "${bacula::director::pool_name}-${client}" - file { "/etc/bacula/conf.d/${client}.conf": - content => template('bacula/director/dir-per-client.erb'), - mode => '0440', - group => bacula, - notify => Exec['bacula-director reload'] + if defined(File["/etc/bacula/conf.d/${client}_storage.conf"]) { + # this config is only valid if the pools defined in ${client}_storage exist. + file { "/etc/bacula/conf.d/${client}.conf": + content => template('bacula/director/dir-per-client.erb'), + mode => '0440', + group => bacula, + notify => Exec['bacula-director reload'] + } } } -- 2.20.1