sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update RHEL7 element since release

Browse Source 
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
This commit is contained in:
Ryan Brady 2014-07-21 16:20:18 -04:00
parent d9d43c6c03
commit 646da5b464
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
elements/rhel7/pre-install.d/05-yum-repos
View File

@ -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

2
elements/rhel7/root.d/10-rhel7-cloud-image
View File

@ -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