X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=ebc3e5c6dca6d7261f6faf356e3fb8cef7d87b26;hb=4b78dc516ce80bf4a76c2851a6d9d1962d1f7084;hp=ba0127f86912bc309c0d45ef7fb4a11d45b62535;hpb=5649a4242e4cea08fa81bafc980eed5cdb7e3607;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index ba0127f86..ebc3e5c6d 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -3,8 +3,7 @@
 # this mostly configures the file daemon, but also firewall rules and
 # fragments to sent to the other servers.
 class bacula::client(
-  Enum['present', 'absent'] $ensure = getfromhash($site::nodeinfo, 'not-bacula-client') ? { true => 'absent', default => 'present' },
-  # Enum['present', 'absent'] $ensure = defined(Class["bacula::not_a_client"]) ? { true => 'absent', default => 'present' },
+  Enum['present', 'absent'] $ensure = defined(Class["bacula::not_a_client"]) ? { true => 'absent', default => 'present' },
 ) inherits bacula {
   $package_ensure = $ensure ? { 'present' => 'installed', 'absent' => 'purged' }
   $service_ensure = $ensure ? { 'present' => 'running', 'absent'  => 'stopped' }
@@ -34,9 +33,12 @@ class bacula::client(
     }
   }
 
-  package { ['bacula-fd', 'bacula-common']:
+  ensure_packages ( [
+   'bacula-fd',
+   'bacula-common',
+  ], {
     ensure => $package_ensure
-  }
+  })
 
   service { 'bacula-fd':
     ensure    => $service_ensure,