Merge pull request #981 from david22swan/MODULES-10971/main/aptkeyser…

…ver_fix (MODULES-10971) - Ensure `apt::keyserver` is considered when creating a default apt:source
puppetlabs · Mar 25, 2021 · 15277f3 · 15277f3
2 parents 18fe46c + a6eb161
commit 15277f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -153,8 +153,15 @@
   String $preferences_d         = $apt::params::preferences_d,
   String $apt_conf_d            = $apt::params::apt_conf_d,
   Hash $config_files            = $apt::params::config_files,
-  Hash $source_key_defaults     = $apt::params::source_key_defaults,
   Boolean $sources_list_force   = $apt::params::sources_list_force,
+
+  Hash $source_key_defaults = {
+    'server'  => $keyserver,
+    'options' => undef,
+    'content' => undef,
+    'source'  => undef,
+  }
+
 ) inherits apt::params {
 
   if $facts['os']['family'] != 'Debian' {

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -71,13 +71,6 @@
     'apt.conf.d'     => false,
   }
 
-  $source_key_defaults = {
-    'server'  => $keyserver,
-    'options' => undef,
-    'content' => undef,
-    'source'  => undef,
-  }
-
   $include_defaults = {
     'deb' => true,
     'src' => false,