From 86539d9ccc828fb3a4f1de00190035d00cab5d5b Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Wed, 13 Jun 2018 10:50:39 +0100
Subject: [PATCH] Revert "Install EPEL repositories manually and exclude Python
 packages"

This reverts commit 0b32750d1162f0fa8a04d44a68912129fbdbbd5c.

Installing EPEL globally is causing package conflicts with the RDO
repository so we should only install it when necessary. This also
ensures that the epel-release package is absent.

Change-Id: I90b375f67455b7d5c3dba25c3ff1579afaad1da2
---
 files/gpg/352C64E5 | 29 -----------------------------
 vars/redhat-7.yml  | 13 ++-----------
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 files/gpg/352C64E5

diff --git a/files/gpg/352C64E5 b/files/gpg/352C64E5
deleted file mode 100644
index f205ede4..00000000
--- a/files/gpg/352C64E5
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFKuaIQBEAC1UphXwMqCAarPUH/ZsOFslabeTVO2pDk5YnO96f+rgZB7xArB
-OSeQk7B90iqSJ85/c72OAn4OXYvT63gfCeXpJs5M7emXkPsNQWWSju99lW+AqSNm
-jYWhmRlLRGl0OO7gIwj776dIXvcMNFlzSPj00N2xAqjMbjlnV2n2abAE5gq6VpqP
-vFXVyfrVa/ualogDVmf6h2t4Rdpifq8qTHsHFU3xpCz+T6/dGWKGQ42ZQfTaLnDM
-jToAsmY0AyevkIbX6iZVtzGvanYpPcWW4X0RDPcpqfFNZk643xI4lsZ+Y2Er9Yu5
-S/8x0ly+tmmIokaE0wwbdUu740YTZjCesroYWiRg5zuQ2xfKxJoV5E+Eh+tYwGDJ
-n6HfWhRgnudRRwvuJ45ztYVtKulKw8QQpd2STWrcQQDJaRWmnMooX/PATTjCBExB
-9dkz38Druvk7IkHMtsIqlkAOQMdsX1d3Tov6BE2XDjIG0zFxLduJGbVwc/6rIc95
-T055j36Ez0HrjxdpTGOOHxRqMK5m9flFbaxxtDnS7w77WqzW7HjFrD0VeTx2vnjj
-GqchHEQpfDpFOzb8LTFhgYidyRNUflQY35WLOzLNV+pV3eQ3Jg11UFwelSNLqfQf
-uFRGc+zcwkNjHh5yPvm9odR1BIfqJ6sKGPGbtPNXo7ERMRypWyRz0zi0twARAQAB
-tChGZWRvcmEgRVBFTCAoNykgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB
-AgAiBQJSrmiEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqL66iNSxk
-5cfGD/4spqpsTjtDM7qpytKLHKruZtvuWiqt5RfvT9ww9GUUFMZ4ZZGX4nUXg49q
-ixDLayWR8ddG/s5kyOi3C0uX/6inzaYyRg+Bh70brqKUK14F1BrrPi29eaKfG+Gu
-MFtXdBG2a7OtPmw3yuKmq9Epv6B0mP6E5KSdvSRSqJWtGcA6wRS/wDzXJENHp5re
-9Ism3CYydpy0GLRA5wo4fPB5uLdUhLEUDvh2KK//fMjja3o0L+SNz8N0aDZyn5Ax
-CU9RB3EHcTecFgoy5umRj99BZrebR1NO+4gBrivIfdvD4fJNfNBHXwhSH9ACGCNv
-HnXVjHQF9iHWApKkRIeh8Fr2n5dtfJEF7SEX8GbX7FbsWo29kXMrVgNqHNyDnfAB
-VoPubgQdtJZJkVZAkaHrMu8AytwT62Q4eNqmJI1aWbZQNI5jWYqc6RKuCK6/F99q
-thFT9gJO17+yRuL6Uv2/vgzVR1RGdwVLKwlUjGPAjYflpCQwWMAASxiv9uPyYPHc
-ErSrbRG0wjIfAR3vus1OSOx3xZHZpXFfmQTsDP7zVROLzV98R3JwFAxJ4/xqeON4
-vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt
-RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw==
-=hdPa
------END PGP PUBLIC KEY BLOCK-----
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 6f6e5c16..7ca8ef8a 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -81,9 +81,6 @@ _openstack_host_metal_distro_packages:
   - yum-utils
 
 _package_repos_keys:
-  - name: epel
-    key: /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-    keyfile: "gpg/352C64E5"
   - name: openstack-queens
     key: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
     keyfile: "gpg/764429E6"
@@ -92,6 +89,8 @@ _package_repos_keys:
     keyfile: "gpg/61E8806C"
 
 _package_list:
+  - name: epel-release
+    state: absent
   - name: yum-plugin-priorities
     state: present
   - name: yum-utils
@@ -106,14 +105,6 @@ _package_list:
     state: absent
 
 _package_repos:
-  - file: epel
-    name: epel
-    description: 'Extra Packages for Enterprise Linux 7 - $basearch'
-    mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch'
-    gpgcheck: yes
-    enabled: yes
-    exclude:
-      - 'python*'
   - file: rdo-qemu-ev
     name: rdo-qemu-ev
     description: "RDO CentOS-7 - QEMU EV"