From 6a2aaf7c805cd5751827ec137c42bce25dca3630 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 20 May 2020 15:15:24 -0700 Subject: [PATCH] Remove failovermethod from fedora dnf repo configs The failovermethod option was removed in dnf and produces eye catching warnings. Clean this up to clean up job output by configure-mirrors. More details at: https://bugzilla.redhat.com/show_bug.cgi?id=1653831 Change-Id: Id646835e0fa9e5e99cde57382b3148caeb55e8bd --- .../templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2 | 3 --- .../templates/fedora/etc/yum.repos.d/fedora.repo.j2 | 3 --- 2 files changed, 6 deletions(-) diff --git a/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2 b/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2 index 64669fa63..3d3067a40 100644 --- a/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2 +++ b/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora-updates.repo.j2 @@ -1,7 +1,6 @@ # {{ ansible_managed }} [updates] name=Fedora $releasever - $basearch - Updates -failovermethod=priority {% if ansible_distribution_version is version('28', '<') %} baseurl={{ package_mirror }}/updates/$releasever/$basearch/ {% else %} @@ -17,7 +16,6 @@ skip_if_unavailable=False [updates-debuginfo] name=Fedora $releasever - $basearch - Updates - Debug -failovermethod=priority {% if ansible_distribution_version is version('28', '<') %} baseurl={{ package_mirror }}/updates/$releasever/$basearch/debug/ {% else %} @@ -33,7 +31,6 @@ skip_if_unavailable=False [updates-source] name=Fedora $releasever - Updates Source -failovermethod=priority {% if ansible_distribution_version is version('28', '<') %} baseurl={{ package_mirror }}/updates/$releasever/SRPMS/ {% else %} diff --git a/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora.repo.j2 b/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora.repo.j2 index 3abdca59d..266775fd1 100644 --- a/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora.repo.j2 +++ b/roles/configure-mirrors/templates/fedora/etc/yum.repos.d/fedora.repo.j2 @@ -1,7 +1,6 @@ # {{ ansible_managed }} [fedora] name=Fedora $releasever - $basearch -failovermethod=priority baseurl={{ package_mirror }}/releases/$releasever/Everything/$basearch/os/ enabled=1 metadata_expire=7d @@ -13,7 +12,6 @@ skip_if_unavailable=False [fedora-debuginfo] name=Fedora $releasever - $basearch - Debug -failovermethod=priority baseurl={{ package_mirror }}/releases/$releasever/Everything/$basearch/debug/tree/ enabled=0 metadata_expire=7d @@ -25,7 +23,6 @@ skip_if_unavailable=False [fedora-source] name=Fedora $releasever - Source -failovermethod=priority baseurl={{ package_mirror }}/releases/$releasever/Everything/source/tree/ enabled=0 metadata_expire=7d