From: Martijn de Gouw <martijn.de.gouw@prodrive-technologies.com>
Date: Thu, 27 Jun 2019 14:58:25 +0000 (+0200)
Subject: Install gnupg instead of dirmngr
X-Git-Tag: v7.2.0~6^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=25ef442c309959116dde6f6965814c07e485be56;p=puppet-modules%2Fpuppetlabs-apt.git

Install gnupg instead of dirmngr

gnupg pulls in dirmngt and gpg, which are needed by apt_key
---

diff --git a/manifests/init.pp b/manifests/init.pp
index d95bbe6..5bb81f2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -302,5 +302,5 @@ class apt (
   }
 
   # required for adding GPG keys on Debian 9 (and derivatives)
-  ensure_packages(['dirmngr'])
+  ensure_packages(['gnupg'])
 }
diff --git a/manifests/key.pp b/manifests/key.pp
index 1f9a495..256ced4 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -66,13 +66,13 @@ define apt::key (
         case $facts['os']['name'] {
           'Debian': {
             if versioncmp($facts['os']['release']['major'], '9') >= 0 {
-              ensure_packages(['dirmngr'])
+              ensure_packages(['gnupg'])
               Apt::Key<| title == $title |>
             }
           }
           'Ubuntu': {
             if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
-              ensure_packages(['dirmngr'])
+              ensure_packages(['gnupg'])
               Apt::Key<| title == $title |>
             }
           }