From 24209e7e6b108808f537cd218fc95ac6a1bfdb47 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sat, 16 Jun 2012 11:19:42 +0200 Subject: [PATCH] Use $name rather than $client, syntax, syntax, syntax --- modules/bacula/manifests/director.pp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp index 513d09686..e4ec300a4 100644 --- a/modules/bacula/manifests/director.pp +++ b/modules/bacula/manifests/director.pp @@ -35,13 +35,13 @@ class bacula::director inherits bacula { refreshonly => true; } - define bacula_client($client) { + define bacula_client() { # These must be kept in sync with the settings in bacula.pp - $bacula_client_name = "$client-fd" - $bacula_client_secret = hmac("/etc/puppet/secret", "bacula-fd-$client") + $bacula_client_name = "${name}-fd" + $bacula_client_secret = hmac("/etc/puppet/secret", "bacula-fd-${name}") file { - "/etc/bacula/conf.d/$client.conf": + "/etc/bacula/conf.d/${name}.conf": content => template("bacula/per-client.conf.erb"), mode => 440, group => bacula, @@ -49,6 +49,7 @@ class bacula::director inherits bacula { ; } } + $allhosts = keys($site::allnodeinfo) - bacula_client { allnodeinfo('hostname', '') } + bacula_client { $allhosts: } } -- 2.20.1