apt::key: Be explicit about the keyserver.

The behaviour of passing down undef through multiple layers gets fuzzy
so for now be explicit about the keyserver.

Once Puppet 4 is out and this behaviour has been crystallised and tested
we can revisit it.

diff --git a/manifests/key.pp b/manifests/key.pp
index 05bda975b097a99b9b70659d292ed4d6f750d64e..6761e6912d31a253fd969c0dd4c5a48d8679e964 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -42,9 +42,7 @@
 #   _default_: +undef+
 #
 #   The keyserver from where to fetch our GPG key. It can either be a domain
-#   name or url. It defaults to
-#   undef which results in apt_key's default keyserver being used,
-#   currently +keyserver.ubuntu.com+.
+#   name or url. It defaults to +keyserver.ubuntu.com+.
 #
 # [*options*]
 #   _default_: +undef+
@@ -55,7 +53,7 @@ define apt::key (
   $ensure  = present,
   $content = undef,
   $source  = undef,
-  $server  = undef,
+  $server  = $::apt::keyserver,
   $options = undef,
 ) {
 

diff --git a/manifests/params.pp b/manifests/params.pp
index 8799f7b98e8be829aaa1bd741b042da9a73f8a37..14401c6c930b19ed9eae71a08d81e22cf64d7f9f 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -11,6 +11,7 @@ class apt::params {
   $conf_d         = "${root}/apt.conf.d"
   $preferences    = "${root}/preferences"
   $preferences_d  = "${root}/preferences.d"
+  $keyserver      = 'keyserver.ubuntu.com'
 
   if $::osfamily != 'Debian' {
     fail('This module only works on Debian or derivatives like Ubuntu')
@@ -52,7 +53,7 @@ class apt::params {
   }
 
   $source_key_defaults = {
-    'server'  => $default_keyserver,
+    'server'  => $keyserver,
     'options' => undef,
     'content' => undef,
     'source'  => undef,