Merge pull request voxpupuli#121 from avidspartan1/master

Puppet 6 issue and knockout_prefix problem
op-ct · Mar 16, 2019 · 3f35c56 · 3f35c56
2 parents 494981f + d80cfc8
commit 3f35c56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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'

diff --git 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),