Issue 3065 - Refactor adblockplus::puppet module to include Puppet patches

modules/adblockplus/manifests/puppet/master.pp

 # == Class: adblockplus::puppet::master
 #
 # Manage Puppet (https://github.com/puppetlabs/puppet) master configuration.
 #
 # === Parameters:
 #
 # [*package*]
 #   Custom parameters for the implicit Package['puppetmaster'] resource.
 #
 # [*service*]
@@ skipping 11 matching lines @@
 #       'ensure' => 'running',
 #       'name' => 'puppetmaster',
 #     },
 #   }
 #
 class adblockplus::puppet::master (
   $package = hiera('adblockplus::puppet::master::package', {}),
   $service = hiera('adblockplus::puppet::master::service', {}),
 ) {
 
-  include adblockplus
+  include adblockplus::puppet
   include puppetmaster
   include stdlib
 
   # https://forge.puppet.com/puppetlabs/stdlib#ensure_resource
-  ensure_resource('package', 'puppetmaster', $package)
+  ensure_resource('package', 'puppetmaster', merge({
+    'ensure' => $adblockplus::puppet::ensure,
+  }, $package))
 
   # https://forge.puppet.com/puppetlabs/stdlib#getparam
   if getparam(Package['puppet'], 'ensure') !~ /^(absent|purged)$/ {
 
     ensure_resource('service', 'puppetmaster', merge({
       'ensure' => 'running',
       'hasrestart' => true,
       'hasstatus' => true,
     }, $service))
 
     Service['puppetmaster'] <- Package['puppetmaster']
   }
 }