Use ensure_packages to simpify packages management

Thanks to stdlib's ensure_packages (available from stdlib 3.2.0, released in 2012) we can avoid the virtual resources.
voxpupuli · Jul 3, 2018 · f954814 · f954814
1 parent c0c5cf5
commit f954814
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 39 deletions.
diff --git a/manifests/director.pp b/manifests/director.pp
@@ -65,18 +65,13 @@
     default:                { fail('No db_type set') }
   }
 
-  # Packages are virtual due to some platforms shipping the SD and Dir as
-  # part of the same package.
-  include ::bacula::virtual
-
   # Allow for package names to include EPP syntax for db_type
   $package_names = $packages.map |$p| {
     $package_name = inline_epp($p, {
       'db_type' => $db_type
     })
   }
-
-  realize(Package[$package_names])
+  ensure_packages($package_names)
 
   service { $services:
     ensure  => running,

diff --git a/manifests/storage.pp b/manifests/storage.pp
@@ -42,18 +42,14 @@
   String             $user           = $bacula::bacula_user,
 ) inherits ::bacula {
 
-  # Packages are virtual due to some platforms shipping the
-  # SD and Dir as part of the same package.
-  include ::bacula::virtual
-
   # Allow for package names to include EPP syntax for db_type
   $db_type = lookup('bacula::director::db_type')
   $package_names = $packages.map |$p| {
     $package_name = inline_epp($p, {
       'db_type' => $db_type
     })
   }
-  realize(Package[$package_names])
+  ensure_packages($package_names)
 
   service { $services:
     ensure  => running,

diff --git a/manifests/virtual.pp b/manifests/virtual.pp