diff options
| author | Daniele Sluijters <daenney@users.noreply.github.com> | 2015-04-22 15:34:53 +0200 |
|---|---|---|
| committer | Daniele Sluijters <daenney@users.noreply.github.com> | 2015-04-22 15:34:53 +0200 |
| commit | 355e766457c8546f234758c0fa55e3f2c8f32b03 (patch) | |
| tree | b7dd63d16f9fd58ed070d91741ca7f6269ee3977 /manifests | |
| parent | b6ca1665241485ce57d5be3131f8b0e987313695 (diff) | |
init: Turn size into a single value.
The `size` hash could only ever have the `max` key so it makes more
sense to have this as a plain value.
This also upgrades the dependency on stdlib to 4.6.0 since we're using
the new `validate_integer` function.
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 5 | ||||
| -rw-r--r-- | manifests/params.pp | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index b524778..72f5d52 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -11,7 +11,7 @@ class unattended_upgrades ( $minimal_steps = true, $origins = $::unattended_upgrades::params::origins, $package_ensure = installed, - $size = {}, + $size = 0, $update = 1, $upgrade = 1, $upgradeable_packages = {}, @@ -38,8 +38,7 @@ class unattended_upgrades ( $_backup = merge($::unattended_upgrades::default_backup, $backup) validate_hash($age) $_age = merge($::unattended_upgrades::default_age, $age) - validate_hash($size) - $_size = merge($::unattended_upgrades::default_size, $size) + validate_integer($size) validate_hash($upgradeable_packages) $_upgradeable_packages = merge($::unattended_upgrades::default_upgradeable_packages, $upgradeable_packages) diff --git a/manifests/params.pp b/manifests/params.pp index a652512..b7ba380 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -8,7 +8,6 @@ class unattended_upgrades::params { $default_mail = { 'only_on_error' => true, } $default_backup = { 'archive_interval' => 0, 'level' => 3, } $default_age = { 'min' => 2, 'max' => 0, } - $default_size = { 'max' => 0, } $default_upgradeable_packages = { 'download_only' => 0, 'debdelta' => 1, } # Strict variables facts lookup compatibility |