From 2ae1ad8f7e5741454d01421a5ce162b43c3604da Mon Sep 17 00:00:00 2001
From: Moritz Schlarb <schlarbm@uni-mainz.de>
Date: Thu, 24 Jan 2019 11:19:49 +0100
Subject: [PATCH] Fix conditionals for Azure after Jessie

As per https://wiki.debian.org/Cloud/MicrosoftAzure, since Stretch, we
don't need to use the debian-azure archive anymore, so we don't need the
keyring, too.
---
 build-openstack-debian-image | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-openstack-debian-image b/build-openstack-debian-image
index 582c791..9d13b12 100755
--- a/build-openstack-debian-image
+++ b/build-openstack-debian-image
@@ -1150,7 +1150,7 @@ deb-src ${SOURCE_LIST_MIRROR}-azure jessie-backports main${NON_FREE}
 " >>${MOUNT_DIR}/etc/apt/sources.list
 fi
 
-if [ "${AZURE}" = "yes" ] ; then
+if [ "${RELEASE}" = "jessie" ] && [ "${AZURE}" = "yes" ] ; then
 	chroot ${MOUNT_DIR} apt-key add - <<EOF
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1
@@ -1176,7 +1176,7 @@ EOF
 fi
 
 chroot ${MOUNT_DIR} apt-get update
-if [ "${AZURE}" = "yes" ] ; then
+if [ "${RELEASE}" = "jessie" ] && [ "${AZURE}" = "yes" ] ; then
 	chroot ${MOUNT_DIR} apt-get install -y -o Dpkg::Options::="--force-confnew" debian-azure-archive-keyring unscd
 	chroot ${MOUNT_DIR} apt-get update
 fi
-- 
GitLab