From 2effd146279ef50143460a13debeb2b58a785980 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 13 Feb 2024 06:23:29 +0100 Subject: [PATCH] yumrepos: Fedora hosts primary vs. secondary simplification The old way of setting Fedora repos was not idempotent for vmhost-p09-copr01.rdu-cc.fedoraproject.org (was considered both primary and secondary). And it appears this would be the same for all Fedora s390x/ppc64le boxes. --- tasks/yumrepos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml index 3cb25ab0ce..36ed0b2cf6 100644 --- a/tasks/yumrepos.yml +++ b/tasks/yumrepos.yml @@ -82,7 +82,7 @@ - fedora.repo - fedora-updates.repo - fedora-updates-testing.repo - when: ansible_distribution == 'Fedora' and not inventory_hostname.startswith(('buildvm-s390x', 'buildvm-ppc64le','bvmhost-p09','buildvmhost-s390x-01')) and not inventory_hostname.startswith('rawhide-test') and datacenter != "aws" + when: ansible_distribution == 'Fedora' and ansible_architecture not in ['ppc64le', 's390x'] and datacenter != "aws" tags: - config - packages @@ -94,7 +94,7 @@ - fedora.repo - fedora-updates.repo - fedora-updates-testing.repo - when: ansible_distribution == 'Fedora' and (ansible_architecture == 'ppc64le' or ansible_architecture == 's390x') and datacenter != "aws" + when: ansible_distribution == 'Fedora' and ansible_architecture in ['ppc64le', 's390x'] and datacenter != "aws" tags: - config - packages