Merge pull request #284 from kenyon/eliminate-params

Convert from `params.pp` to hiera data

Author: kenyon

README.md

@@ -191,7 +191,7 @@ altering some of the default settings.
 
 ## Limitations
 
-This module should work across all versions of Debian, Ubuntu, and Linux Mint.
+This module should work across all supported versions of Debian and Ubuntu.
 
 ## License
 

REFERENCE.md

@@ -7,7 +7,6 @@
 ### Classes
 
 * [`unattended_upgrades`](#unattended_upgrades): Installs and configures unattended-upgrades.
-* [`unattended_upgrades::params`](#unattended_upgrades--params): Provides default parameters for the unattended_upgrades module.
 
 ### Data types
 
@@ -148,7 +147,14 @@ Data type: `Array[Unattended_upgrades::Origin]`
 
 Array of origins to allow automatic upgrades from.
 
-Default value: `$unattended_upgrades::params::origins`
+Default value:
+
+```puppet
+[
+    'origin=Debian,codename=${distro_codename},label=Debian', #lint:ignore:single_quote_string_with_variables
+    'origin=Debian,codename=${distro_codename}-security,label=Debian-Security', #lint:ignore:single_quote_string_with_variables
+  ]
+```
 
 ##### <a name="-unattended_upgrades--package_ensure"></a>`package_ensure`
 
@@ -330,10 +336,6 @@ Specifies whether the service should be enabled at boot.
 
 Default value: `true`
 
-### <a name="unattended_upgrades--params"></a>`unattended_upgrades::params`
-
-This class provides default parameters for the unattended_upgrades module.
-
 ## Data types
 
 ### <a name="Unattended_upgrades--Age"></a>`Unattended_upgrades::Age`

data/os/Ubuntu.yaml

@@ -0,0 +1,5 @@
+unattended_upgrades::origins:
+  - origin=${distro_id},suite=${distro_codename}
+  - origin=${distro_id},suite=${distro_codename}-security
+  - origin=${distro_id}ESMApps,suite=${distro_codename}-apps-security
+  - origin=${distro_id}ESM,suite=${distro_codename}-infra-security

hiera.yaml

@@ -0,0 +1,5 @@
+version: 5
+
+hierarchy:
+  - name: OS name
+    path: "os/%{facts.os.name}.yaml"

manifests/init.pp

@@ -84,7 +84,10 @@
   Boolean                                   $install_on_shutdown    = false,
   Unattended_upgrades::Mail                 $mail                   = {},
   Boolean                                   $minimal_steps          = true,
-  Array[Unattended_upgrades::Origin]        $origins                = $unattended_upgrades::params::origins,
+  Array[Unattended_upgrades::Origin]        $origins                = [
+    'origin=Debian,codename=${distro_codename},label=Debian', #lint:ignore:single_quote_string_with_variables
+    'origin=Debian,codename=${distro_codename}-security,label=Debian-Security', #lint:ignore:single_quote_string_with_variables
+  ],
   String[1]                                 $package_ensure         = installed,
   Array[Unattended_upgrades::Origin]        $extra_origins          = [],
   Optional[Integer[0]]                      $random_sleep           = undef,
@@ -107,23 +110,41 @@
   Array[String[1]]                          $dpkg_options           = [],
   Enum['running', 'stopped']                $service_ensure         = 'running',
   Boolean                                   $service_enable         = true,
-) inherits unattended_upgrades::params {
+) {
   # apt::conf settings require the apt class to work
   include apt
 
-  $_age = $unattended_upgrades::default_age + $age
+  $_age = {
+    'min' => 2,
+    'max' => 0,
+  } + $age
   assert_type(Unattended_upgrades::Age, $_age)
 
-  $_auto = $unattended_upgrades::default_auto + $auto
+  $_auto = {
+    'fix_interrupted_dpkg' => true,
+    'remove' => true,
+    'reboot' => false,
+    'reboot_withusers' => true,
+    'clean' => 0,
+    'reboot_time' => 'now',
+  } + $auto
   assert_type(Unattended_upgrades::Auto, $_auto)
 
-  $_backup = $unattended_upgrades::default_backup + $backup
+  $_backup = {
+    'archive_interval' => 0,
+    'level' => 3,
+  } + $backup
   assert_type(Unattended_upgrades::Backup, $_backup)
 
-  $_mail = $unattended_upgrades::default_mail + $mail
+  $_mail = {
+    'only_on_error' => true,
+  } + $mail
   assert_type(Unattended_upgrades::Mail, $_mail)
 
-  $_upgradeable_packages = $unattended_upgrades::default_upgradeable_packages + $upgradeable_packages
+  $_upgradeable_packages = {
+    'download_only' => 0,
+    'debdelta' => 1,
+  } + $upgradeable_packages
   assert_type(Unattended_upgrades::Upgradeable_packages, $_upgradeable_packages)
 
   package { 'unattended-upgrades':

manifests/params.pp

@@ -15,7 +15,6 @@
       it do
         is_expected.to contain_package('unattended-upgrades')
         is_expected.to compile.with_all_deps
-        is_expected.to contain_class('unattended_upgrades::params')
         is_expected.to contain_class('unattended_upgrades')
         is_expected.to contain_class('apt')
       end