From a7f7d1bf8e89ca96e4d1f5312c08f99232948e07 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@lockbox01.phx2.fedoraproject.org>
Date: Tue, 24 Mar 2015 23:00:54 +0000
Subject: [PATCH] yumrepos: make the aarch64 yum repos support generic for all
 secondary architectures

---
 .../fedora-updates-testing.repo-aarch64       | 26 -----------------
 files/common/fedora-updates.repo-aarch64      | 26 -----------------
 files/common/fedora.repo-aarch64              | 29 -------------------
 tasks/yumrepos.yml                            |  6 ++--
 4 files changed, 3 insertions(+), 84 deletions(-)
 delete mode 100644 files/common/fedora-updates-testing.repo-aarch64
 delete mode 100644 files/common/fedora-updates.repo-aarch64
 delete mode 100644 files/common/fedora.repo-aarch64

diff --git a/files/common/fedora-updates-testing.repo-aarch64 b/files/common/fedora-updates-testing.repo-aarch64
deleted file mode 100644
index efdbb8580c..0000000000
--- a/files/common/fedora-updates-testing.repo-aarch64
+++ /dev/null
@@ -1,26 +0,0 @@
-[updates-testing]
-name=Fedora $releasever - $basearch - Test Updates
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
-
-[updates-testing-debuginfo]
-name=Fedora $releasever - $basearch - Test Updates Debug
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/$basearch/debug/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
-
-[updates-testing-source]
-name=Fedora $releasever - Test Updates Source
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/SRPMS/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
diff --git a/files/common/fedora-updates.repo-aarch64 b/files/common/fedora-updates.repo-aarch64
deleted file mode 100644
index 135b6cc082..0000000000
--- a/files/common/fedora-updates.repo-aarch64
+++ /dev/null
@@ -1,26 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
-
-[updates-debuginfo]
-name=Fedora $releasever - $basearch - Updates - Debug
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/$basearch/debug/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
-
-[updates-source]
-name=Fedora $releasever - Updates Source
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/SRPMS/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
diff --git a/files/common/fedora.repo-aarch64 b/files/common/fedora.repo-aarch64
deleted file mode 100644
index 3962b1421a..0000000000
--- a/files/common/fedora.repo-aarch64
+++ /dev/null
@@ -1,29 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=1
-metadata_expire=7d
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
-
-[fedora-debuginfo]
-name=Fedora $releasever - $basearch - Debug
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/debug/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
-
-[fedora-source]
-name=Fedora $releasever - Source
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/source/SRPMS/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index 6eabc7f892..ff928c70ec 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -33,13 +33,13 @@
   - packages
   - yumrepos
 
-- name: put fedora repos on aarch64 systems
-  action: copy src="{{ files }}/common/{{ item }}-aarch64" dest="/etc/yum.repos.d/{{ item }}"
+- name: put fedora repos on secondary architecture systems
+  action: copy src="{{ files }}/common/{{ item }}-secondary" dest="/etc/yum.repos.d/{{ item }}"
   with_items:
   - fedora.repo
   - fedora-updates.repo
   - fedora-updates-testing.repo
-  when: ansible_distribution == 'Fedora' and ansible_architecture == 'aarch64'
+  when: ansible_distribution == 'Fedora' and (ansible_architecture == 'aarch64' or ansible_architecture == 'ppc64' or ansible_architecture == 'ppc64le')
   tags:
   - config
   - packages