From: david22swan <david.swan@puppet.com>
Date: Wed, 26 Sep 2018 12:06:10 +0000 (+0100)
Subject: Merge pull request #801 from eimlav/modules6408
X-Git-Tag: 6.1.0~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c041641c01d00d470d4e8d63a1bcc651d53932ab;hp=9e44e974a970025df09f217bf95b237c2b625845;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #801 from eimlav/modules6408

(MODULES-6408) - Fix dirmngr install failing
---

diff --git a/manifests/init.pp b/manifests/init.pp
index f3472ac..27cc09c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -208,6 +208,13 @@ class apt (
     content  => "${confheadertmp}${updatestamptmp}",
   }
 
+  # Required for adding GPG keys on Debian 9 (and derivatives)
+  $apt_files = [ 'sources.list', 'sources.list.d', 'preferences', 'preferences.d', '/etc/apt/auth.conf' ]
+  package { 'dirmngr':
+    ensure => present,
+    before => [File[$apt_files]]
+  }
+
   file { 'sources.list':
     ensure  => file,
     path    => $::apt::sources_list,
@@ -289,7 +296,4 @@ class apt (
   if $pins {
     create_resources('apt::pin', $pins)
   }
-
-  # required for adding GPG keys on Debian 9 (and derivatives)
-  ensure_packages(['dirmngr'])
 }