From 339340409823927bb987f0195c6cedfdace05f4a Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Wed, 24 May 2017 23:02:10 +0200
Subject: [PATCH] Add gnupg2 install for zypper as well

As of today zypper is explicitly using /usr/bin/gpg2 for signature
validation but this is typically not installed on an Ubuntu host
because it defaults to gnupg (1.x, which only provides /usr/bin/gpg).

This change is needed so that the zypper-minimal element has a
chance of working on a Xenial host.

Change-Id: If57b07dcf31b8eeb2a3a44442315dd1d70b3523d
---
 manifests/init.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index b224538..8bafcea 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -47,7 +47,9 @@ class diskimage_builder (
 
   # Ubuntu trusty doesn't support zypper today, so skip it.
   if ($::lsbdistcodename != 'trusty') {
-    package { 'zypper':
+    # gnupg2 is a missing dependency on zypper, see
+    # https://bugs.launchpad.net/bugs/1639428
+    package { ['zypper', 'gnupg2']:
       ensure => present,
     }
   }