From dfd99460c7530b973bced49af539769302bd5311 Mon Sep 17 00:00:00 2001
From: Ryan Brady <rbrady@redhat.com>
Date: Wed, 17 Sep 2014 21:32:49 -0400
Subject: [PATCH] Adds EPEL repo, cleans up rhel7 repos

This patch adds a new EPEL element for use with EL-based distros
in accordance with the official docs[1].  This patch also
modifies the rhel7 element to not use the hard-coded repo file.

[1] https://fedoraproject.org/wiki/EPEL

Change-Id: Ib2fa24b2d519837271a0e213a2dc5a012cc31f3c
---
 elements/epel/README.md                       |  2 ++
 .../epel/pre-install.d/05-rpm-epel-release    |  5 ++++
 elements/rhel7/pre-install.d/05-yum-repos     | 23 -------------------
 3 files changed, 7 insertions(+), 23 deletions(-)
 create mode 100644 elements/epel/README.md
 create mode 100755 elements/epel/pre-install.d/05-rpm-epel-release
 delete mode 100755 elements/rhel7/pre-install.d/05-yum-repos

diff --git a/elements/epel/README.md b/elements/epel/README.md
new file mode 100644
index 000000000..3242d95af
--- /dev/null
+++ b/elements/epel/README.md
@@ -0,0 +1,2 @@
+This element installs the Extra Packages for Enterprise Linux (EPEL)
+repository GPG key as well as configuration for yum.
diff --git a/elements/epel/pre-install.d/05-rpm-epel-release b/elements/epel/pre-install.d/05-rpm-epel-release
new file mode 100755
index 000000000..084f7d559
--- /dev/null
+++ b/elements/epel/pre-install.d/05-rpm-epel-release
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -eu
+set -o pipefail
+
+yum install -y http://dl.fedoraproject.org/pub/epel/beta/7/x86_64/epel-release-7-1.noarch.rpm
diff --git a/elements/rhel7/pre-install.d/05-yum-repos b/elements/rhel7/pre-install.d/05-yum-repos
deleted file mode 100755
index e5ca34133..000000000
--- a/elements/rhel7/pre-install.d/05-yum-repos
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-cat << EOF > /etc/yum.repos.d/epel.repo
-[epel]
-name=epel
-failovermethod=priority
-baseurl=http://download-i2.fedoraproject.org/pub/epel/beta/7/x86_64/
-enabled=1
-metadata_expire=7d
-gpgcheck=0
-EOF
-
-cat << EOF > /etc/yum.repos.d/bnemec-os-config.repo
-[bnemec-os-config]
-name=Copr repo for os-config owned by bnemec
-baseurl=http://copr-be.cloud.fedoraproject.org/results/bnemec/os-config/epel-7-x86_64/
-skip_if_unavailable=True
-gpgcheck=0
-enabled=1
-EOF