From 6428c81ec7e7fa224995ecbe15da4439b5cfc884 Mon Sep 17 00:00:00 2001
From: Paul Hoisington <pdhoisington@gmail.com>
Date: Mon, 1 Oct 2018 12:34:08 -0400
Subject: [PATCH 1/2] Removing knockout prefix for gpgkeys merging, as it
 knocks out valid content

---
 data/common.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/common.yaml b/data/common.yaml
index 5f5c847f..6d088d76 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -10,7 +10,6 @@ lookup_options:
     yum::gpgkeys:
         merge:
             strategy: 'deep'
-            knockout_prefix: '--'
             merge_hash_arrays: true
     yum::managed_repos:
         merge: 'unique'

From d80cfc871a7b8e05aa1e5893a6d5edce9ee40415 Mon Sep 17 00:00:00 2001
From: Paul Hoisington <pdhoisington@gmail.com>
Date: Mon, 1 Oct 2018 12:56:45 -0400
Subject: [PATCH 2/2] Fixing a bug seen in Puppet 6 where undefined values are
 not removed

---
 manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a29d583a..09a7f110 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -207,7 +207,7 @@
     default                  => '3',
   }
 
-  $_pc_cmd = delete_undef_values([
+  $_pc_cmd = [
     '/usr/bin/package-cleanup',
     '--oldkernels',
     "--count=${_real_installonly_limit}",
@@ -216,7 +216,7 @@
       true    => '--keepdevel',
       default => undef,
     },
-  ])
+  ].filter |$val| { $val =~ NotUndef }
 
   exec { 'package-cleanup_oldkernels':
     command     => shellquote($_pc_cmd),