From b43a3f8a49c27d41f4cc0c059ce6d7465f7952d3 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Tue, 24 Mar 2015 22:44:56 +0000
Subject: [PATCH] yumrepos: ARMv7 is identical to x86 now it's primary so
 there's no reason to treat it differently

---
 files/common/fedora-updates-testing.repo-arm | 26 ------------------
 files/common/fedora-updates.repo-arm         | 26 ------------------
 files/common/fedora.repo-arm                 | 29 --------------------
 tasks/yumrepos.yml                           | 16 ++---------
 4 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 files/common/fedora-updates-testing.repo-arm
 delete mode 100644 files/common/fedora-updates.repo-arm
 delete mode 100644 files/common/fedora.repo-arm

diff --git a/files/common/fedora-updates-testing.repo-arm b/files/common/fedora-updates-testing.repo-arm
deleted file mode 100644
index ed171c0a34..0000000000
--- a/files/common/fedora-updates-testing.repo-arm
+++ /dev/null
@@ -1,26 +0,0 @@
-[updates-testing]
-name=Fedora $releasever - $basearch - Test Updates
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/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/linux/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/linux/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-arm b/files/common/fedora-updates.repo-arm
deleted file mode 100644
index b4f079f155..0000000000
--- a/files/common/fedora-updates.repo-arm
+++ /dev/null
@@ -1,26 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/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/linux/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/linux/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-arm b/files/common/fedora.repo-arm
deleted file mode 100644
index 68604f45dc..0000000000
--- a/files/common/fedora.repo-arm
+++ /dev/null
@@ -1,29 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/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/linux/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/linux/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 2c6c0af131..0fd188437f 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -21,25 +21,13 @@
   - packages
   - yumrepos
 
-- name: put fedora repos on x86 systems
+- name: put fedora repos on primary architecture systems
   action: copy src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
   with_items:
   - fedora.repo
   - fedora-updates.repo
   - fedora-updates-testing.repo
-  when: ansible_distribution == 'Fedora' and (ansible_architecture == 'x86_64' or ansible_architecture == 'i386')
-  tags:
-  - config
-  - packages
-  - yumrepos
-
-- name: put fedora repos on arm systems
-  action: copy src="{{ files }}/common/{{ item }}-arm" dest="/etc/yum.repos.d/{{ item }}"
-  with_items:
-  - fedora.repo
-  - fedora-updates.repo
-  - fedora-updates-testing.repo
-  when: ansible_distribution == 'Fedora' and ansible_architecture == 'armv7l' and not inventory_hostname.startswith('arm03')
+  when: ansible_distribution == 'Fedora' and (ansible_architecture == 'x86_64' or ansible_architecture == 'i386' or ansible_architecture == 'armv7l')
   tags:
   - config
   - packages