From: Florin Dragos <florindragos@users.noreply.github.com>
Date: Wed, 4 Sep 2019 11:31:27 +0000 (+0300)
Subject: Merge pull request #866 from martijndegouw/master
X-Git-Tag: v7.2.0~6
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=63878326cdce720172e7b0d1f8300751824d6d6c;hp=417ee21569871b360ca588ac5cc4cb8826afafbe;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #866 from martijndegouw/master

Install gnupg instead of dirmngr
---

diff --git a/manifests/init.pp b/manifests/init.pp
index f205b3e..b21ce12 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -321,5 +321,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 41e78e6..8ef3ef1 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 |>
             }
           }