From 456b6cf394890ec7ec9b9900fccedc9f8026bc2b Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 1 Oct 2019 05:59:52 +0000
Subject: [PATCH] Remove "failovermethod=priority" for Fedora (dnf)

This is no longer a valid option for dnf, and it puts out a lot of
warnings constantly about the invalid entry [1].  Remove it.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1653831

Change-Id: Iba0585cab3e5e78e9324196f276b2341e7bb9e3c
---
 contrib/setup-gate-mirrors.sh                                   | 2 --
 diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo  | 2 --
 .../templates/fedora-minimal/default/fedora-updates.repo.j2     | 1 -
 .../templates/fedora-minimal/default/fedora.repo.j2             | 1 -
 4 files changed, 6 deletions(-)

diff --git a/contrib/setup-gate-mirrors.sh b/contrib/setup-gate-mirrors.sh
index 78d024aec..5cff802b6 100755
--- a/contrib/setup-gate-mirrors.sh
+++ b/contrib/setup-gate-mirrors.sh
@@ -28,7 +28,6 @@ mkdir -p $FEDORA_MIN_DIR
 cat <<EOF > $FEDORA_MIN_DIR/dib-mirror-fedora.repo
 [fedora]
 name=Fedora \$releasever - \$basearch
-failovermethod=priority
 baseurl=$NODEPOOL_FEDORA_MIRROR/releases/\$releasever/Everything/\$basearch/os/
 enabled=1
 metadata_expire=7d
@@ -41,7 +40,6 @@ EOF
 cat <<EOF > $FEDORA_MIN_DIR/dib-mirror-fedora-updates.repo
 [updates]
 name=Fedora \$releasever - \$basearch - Updates
-failovermethod=priority
 baseurl=$NODEPOOL_FEDORA_MIRROR/updates/\$releasever/Everything/\$basearch/
 enabled=1
 gpgcheck=0
diff --git a/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo b/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo
index 469ed9b9d..a9aef2cce 100644
--- a/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo
+++ b/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo
@@ -1,6 +1,5 @@
 [fedora]
 name=Fedora $releasever - $basearch
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 gpgcheck=0
@@ -8,7 +7,6 @@ skip_if_unavailable=False
 
 [updates]
 name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=1
diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
index 5725c6654..8aa56dfea 100644
--- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
+++ b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
@@ -1,6 +1,5 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
 baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/Everything/$basearch/
 enabled=1
 gpgcheck=0
diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2
index 74853f8d6..b5ca357df 100644
--- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2
+++ b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2
@@ -1,6 +1,5 @@
 [fedora]
 name=Fedora $releasever - $basearch
-failovermethod=priority
 baseurl=http://{{ mirror_fqdn }}/fedora/releases/$releasever/Everything/$basearch/os/
 enabled=1
 metadata_expire=7d