Issue 3574 - Move APT setup from class base to module adblockplus

modules/adblockplus/manifests/init.pp

 # == Class: adblockplus
 #
 # The adblockplus class and the associated adblockplus:: namespace are
 # used to integrate Puppet modules with each other, in order to assemble
 # the setups used by the Adblock Plus project.
 #
 # === Parameters:
 #
 # [*authority*]
 #   The authorative domain or zone associated with the current environment,
@@ skipping 16 matching lines @@
 class adblockplus (
   $authority = hiera('adblockplus::authority', 'adblockplus.org'),
   $users = hiera_hash('adblockplus::users', {}),
 ) {
 
   # See https://issues.adblockplus.org/ticket/3574#comment:8
   class {'base':
     zone => $authority,
   }
 
+  # Class['apt'] cannot yet be configured to update on-demand
+  class {'apt':
+    always_apt_update => ($environment != 'development'),
+  }
+
   # Used as internal constant within adblockplus::* resources
   $directory = '/var/adblockplus'
 
   # A common location for directories specific to the adblockplus:: setups,
   # managed via Puppet, but accessible by all users with access to the system
   @file {$directory:
     ensure => 'directory',
     mode => 0755,
     owner => 'root',
   }
@@ skipping 21 matching lines @@
       '/etc/ssh/ssh_host_rsa_key':
         source => 'puppet:///modules/adblockplus/development_host_rsa_key',
         mode => 600,
         notify => Service['ssh'];
       '/etc/ssh/ssh_host_rsa_key.pub':
         source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub',
         mode => 644;
     }
   }
 
+  # Fix implicit package dependency Class['apt'] does not properly handle
+  Exec['apt_update'] -> Package<|title != 'python-software-properties'|>
+
   # See modules/adblockplus/manifests/user.pp
   create_resources('adblockplus::user', $users)
 }