From 646da5b464978b6aa742ab197d71170308196bd0 Mon Sep 17 00:00:00 2001
From: Ryan Brady <rbrady@redhat.com>
Date: Mon, 21 Jul 2014 16:20:18 -0400
Subject: [PATCH] Update RHEL7 element since release

This patch updates the RHEL7 element to work
properly now that it has changed from beta to
release status.  It includes a repo update to
locate os-config rpms not in epel yet and an
update to the latest cloud image name.

Change-Id: I05607d62193c8f8fb1c1bece9872d456b19c5a08
---
 elements/rhel7/pre-install.d/05-yum-repos  | 19 +++++++++----------
 elements/rhel7/root.d/10-rhel7-cloud-image |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/elements/rhel7/pre-install.d/05-yum-repos b/elements/rhel7/pre-install.d/05-yum-repos
index f0ea33aa1..e5ca34133 100755
--- a/elements/rhel7/pre-install.d/05-yum-repos
+++ b/elements/rhel7/pre-install.d/05-yum-repos
@@ -3,16 +3,6 @@
 set -eu
 set -o pipefail
 
-cat << EOF > /etc/yum.repos.d/rhel7.repo
-[rhel7]
-name=RHEL7
-failovermethod=priority
-baseurl=http://ftp.redhat.com/redhat/rhel/beta/7/x86_64/os/
-enabled=1
-metadata_expire=7d
-gpgcheck=0
-EOF
-
 cat << EOF > /etc/yum.repos.d/epel.repo
 [epel]
 name=epel
@@ -22,3 +12,12 @@ 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
diff --git a/elements/rhel7/root.d/10-rhel7-cloud-image b/elements/rhel7/root.d/10-rhel7-cloud-image
index a11bf854a..53b33a11f 100755
--- a/elements/rhel7/root.d/10-rhel7-cloud-image
+++ b/elements/rhel7/root.d/10-rhel7-cloud-image
@@ -22,7 +22,7 @@ if [ -n "$DIB_LOCAL_IMAGE" ]; then
 else
     DIB_RELEASE=${DIB_RELEASE:-latest}
     DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://rhn.redhat.com}
-    BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-rhel-guest-image-6-6.5-20131115.0-1.qcow2}
+    BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-rhel-guest-image-7.0-20140506.1.x86_64.qcow2}
     BASE_IMAGE_TAR=$DIB_RELEASE-rhel-server-$ARCH-latest.tgz
     IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE
     CACHED_IMAGE=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE