diff options
| -rw-r--r-- | .fixtures.yml | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 5 | ||||
| -rw-r--r-- | manifests/params.pp | 1 | ||||
| -rw-r--r-- | metadata.json | 2 | ||||
| -rw-r--r-- | spec/classes/unattended_upgrades_spec.rb | 4 | ||||
| -rw-r--r-- | templates/periodic.erb | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/.fixtures.yml b/.fixtures.yml index 89a888a..5326b19 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,7 +2,7 @@ fixtures: forge_modules: stdlib: repo: "puppetlabs-stdlib" - ref: "4.5.1" + ref: "4.6.0" repositories: apt: repo: "https://github.com/puppetlabs/puppetlabs-apt.git" 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 diff --git a/metadata.json b/metadata.json index 8e68403..6bb45fa 100644 --- a/metadata.json +++ b/metadata.json @@ -35,7 +35,7 @@ } ], "dependencies": [ - {"name":"puppetlabs/stdlib","version_requirement":">= 4.5.0 < 5.0.0"}, + {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 5.0.0"}, {"name":"puppetlabs/apt","version_requirement":">= 2.0.0 < 3.0.0"} ] } diff --git a/spec/classes/unattended_upgrades_spec.rb b/spec/classes/unattended_upgrades_spec.rb index bdacc2d..28feaa7 100644 --- a/spec/classes/unattended_upgrades_spec.rb +++ b/spec/classes/unattended_upgrades_spec.rb @@ -111,7 +111,7 @@ describe 'unattended_upgrades' do let :params do { :age => { 'min' => 1, 'max' => 20 }, - :size => { 'max' => 1000 }, + :size => 1000, :update => 5, :upgradeable_packages => { 'download_only' => 5, @@ -334,7 +334,7 @@ describe 'unattended_upgrades' do it do expect { subject.call - }.to raise_error(Puppet::Error, /not a Hash/) + }.to raise_error(Puppet::Error, /to be an Integer/) end end context 'bad upgradeable_packages' do diff --git a/templates/periodic.erb b/templates/periodic.erb index af6af7c..1ce615a 100644 --- a/templates/periodic.erb +++ b/templates/periodic.erb @@ -16,7 +16,7 @@ APT::Periodic::MinAge "<%= @_age['min'] %>"; # will not be deleted (0=disable). Usefull to prevent races # and to keep backups of the packages for emergency. # -APT::Periodic::MaxSize "<%= @_size['max'] %>"; +APT::Periodic::MaxSize "<%= @size %>"; # - Set maximum size of the cache in MB (0=disable). If the cache # is bigger, cached package files are deleted until the size # requirement is met (the biggest packages will be deleted |