(maint) - Minor logic changes related to apt_key refresh param

diff --git a/lib/puppet/type/apt_key.rb b/lib/puppet/type/apt_key.rb
index e192077ae6fcfba966bc70a83ad94fa860dc2671..72f56fa1c3708a6afc927693a4a05d66f9bf65ef 100644 (file)
--- a/lib/puppet/type/apt_key.rb
+++ b/lib/puppet/type/apt_key.rb
@@ -77,6 +77,7 @@ Puppet::Type.newtype(:apt_key) do
 
   newparam(:refresh, boolean: true, parent: Puppet::Parameter::Boolean) do
     desc 'When true, recreate an existing expired key'
+    defaultto false
   end
 
   newproperty(:fingerprint) do

diff --git a/manifests/source.pp b/manifests/source.pp
index cca03e97527ce921e93afc89db49d33c461a3580..9c50f1a30dfb1a0dd75cf58e527488de92d205dc 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -145,8 +145,14 @@ define apt::source(
   # We do not want to remove keys when the source is absent.
   if $key and ($ensure == 'present') {
     if $_key =~ Hash {
+      if $_key['ensure'] != undef {
+        $_ensure = $_key['ensure']
+      } else {
+        $_ensure = $ensure
+      }
+
       apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}":
-        ensure  => present,
+        ensure  => $_ensure,
         id      => $_key['id'],
         server  => $_key['server'],
         content => $_key['content'],