From 43aa849174f14189ce671a40607fa0ec6d41456c Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 6 Aug 2020 13:59:27 -0700
Subject: [PATCH] Drop suse mirror types in our zypper repo configs

zypper wants to autodetect these values and it appears that upstream
changes repo types because we are having errors now. Dropping this
config manually on a held node seems to fix things.

Change-Id: I8ad28da7164d9a0955f43d4864ba24c14f0bd4a3
---
 .../templates/suse/etc/zypp/repos.d/repo-oss.repo.j2             | 1 -
 .../templates/suse/etc/zypp/repos.d/repo-update.repo.j2          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/roles/configure-mirrors/templates/suse/etc/zypp/repos.d/repo-oss.repo.j2 b/roles/configure-mirrors/templates/suse/etc/zypp/repos.d/repo-oss.repo.j2
index d345196e4..ab8f57c2a 100644
--- a/roles/configure-mirrors/templates/suse/etc/zypp/repos.d/repo-oss.repo.j2
+++ b/roles/configure-mirrors/templates/suse/etc/zypp/repos.d/repo-oss.repo.j2
@@ -4,5 +4,4 @@ name=repo-oss
 enabled=1
 autorefresh=0
 baseurl={{ opensuse_repo_baseurl }}
-type=yast2
 keeppackages=0
diff --git a/roles/configure-mirrors/templates/suse/etc/zypp/repos.d/repo-update.repo.j2 b/roles/configure-mirrors/templates/suse/etc/zypp/repos.d/repo-update.repo.j2
index c21dbdaa5..e41fae527 100644
--- a/roles/configure-mirrors/templates/suse/etc/zypp/repos.d/repo-update.repo.j2
+++ b/roles/configure-mirrors/templates/suse/etc/zypp/repos.d/repo-update.repo.j2
@@ -4,5 +4,4 @@ name=repo-update
 enabled=1
 autorefresh=0
 baseurl={{ package_mirror }}/update/leap/$releasever/oss/
-type=rpm-md
 keeppackages=0