Merge pull request #657 from puppetlabs/binford2k-patch-1

[puppet-modules/puppetlabs-apt.git] / manifests / key.pp

diff --git a/manifests/key.pp b/manifests/key.pp
index dfa1daf2b61935886b79cf22b5876511807397c4..8f9d66bcc9a1bf2b45742fec5007a9a849a98f31 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -33,6 +33,24 @@ define apt::key (
           server  => $server,
           options => $options,
         } -> anchor { "apt_key ${id} present": }
+
+        case $facts['os']['name'] {
+          'Debian': {
+            if versioncmp($facts['os']['release']['full'], '9.0') >= 0 {
+              Apt::Key<| title == $title |> {
+                require => Package['dirmngr']
+              }
+            }
+          }
+          'Ubuntu': {
+            if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
+              Apt::Key<| title == $title |> {
+                require => Package['dirmngr']
+              }
+            }
+          }
+          default: { }
+        }
       }
     }