From 298c0afe7b6cc8be4dd1e0384b58709230736d83 Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimhin.laverty@puppet.com>
Date: Fri, 19 Oct 2018 14:54:30 +0100
Subject: [PATCH] (maint) - Minor logic changes related to apt_key refresh
 param

---
 lib/puppet/type/apt_key.rb | 1 +
 manifests/source.pp        | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/puppet/type/apt_key.rb b/lib/puppet/type/apt_key.rb
index e192077..72f56fa 100644
--- 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 cca03e9..9c50f1a 100644
--- 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'],
-- 
2.32.3