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

Merge "Update RHEL7 element since release"

Browse Source
This commit is contained in:
Jenkins 2014-07-25 16:41:22 +00:00 committed by Gerrit Code Review
commit 72409a5fe9
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 -eu
set -o pipefail 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 cat << EOF > /etc/yum.repos.d/epel.repo
[epel] [epel]
name=epel name=epel
@ -22,3 +12,12 @@ enabled=1
metadata_expire=7d metadata_expire=7d
gpgcheck=0 gpgcheck=0
EOF 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 else
DIB_RELEASE=${DIB_RELEASE:-latest} DIB_RELEASE=${DIB_RELEASE:-latest}
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://rhn.redhat.com} 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 BASE_IMAGE_TAR=$DIB_RELEASE-rhel-server-$ARCH-latest.tgz
IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE
CACHED_IMAGE=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE CACHED_IMAGE=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE