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 d95bbe60b2225c20e9c40b236f73a22ee7d1e5e9..5bb81f2dd17195bbab55a3eeacd0af52df3f289b 100644 (file)
--- 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 1f9a495f54f4f3f19424fe571842ed04955bd46f..256ced4d09d32c967f725dec62338c927403dd0e 100644 (file)
--- 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 |>
             }
           }