From b9e77477bbf0e253d76b5c5c032b0669fe2d3325 Mon Sep 17 00:00:00 2001 From: Perry Myers Date: Sat, 1 Mar 2014 11:07:35 -0500 Subject: [PATCH] Update the image name for RHEL Guest Image The RHEL 6 Guest Image has been updated with a new release that addresses a number of bugs. The diskimage-builder element that references this file needed to be updated to reference the correct image name. In addition, some notes to help users download the image from RHN have been added to the README. Change-Id: I3c9e64a1887afd9c0b370d70eff4b7f9598cebd1 Closes-bug: launchpad-bug-1286568 --- elements/rhel/README.md | 6 ++++-- elements/rhel/root.d/10-rhel-cloud-image | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/elements/rhel/README.md b/elements/rhel/README.md index cf0480b2e..25a5a9bc1 100644 --- a/elements/rhel/README.md +++ b/elements/rhel/README.md @@ -1,8 +1,10 @@ # Overrides: ## General -* Set DIB_CLOUD_IMAGES to a URL for downloading base Red Hat Enterprise Linux cloud image. -* Set DIB_CLOUD_RELEASE to a use a non-default name for the Red Hat Enterprise Linux cloud image. +* Downloading the Red Hat Enterprise Linux cloud image requires a valid Red Hat Network login and a subscription to Red Hat Enterprise Linux 6 Server product. +* diskimage-builder does not integrate directly with RHN, so a manual download is required. Please visit https://rhn.redhat.com/rhn/software/channel/downloads/Download.do?cid=16952 to download the qcow2 file. +* Set DIB_CLOUD_IMAGES to "file:///download_path" +* Overriding of DIB_RELEASE is necessary when a new version of the RHEL qcow2 image is available and the default image has not yet been updated in diskimage-builder. ## Red Hat Subscription Manager (RHSM) diff --git a/elements/rhel/root.d/10-rhel-cloud-image b/elements/rhel/root.d/10-rhel-cloud-image index 1141b7f14..56d119305 100755 --- a/elements/rhel/root.d/10-rhel-cloud-image +++ b/elements/rhel/root.d/10-rhel-cloud-image @@ -9,9 +9,9 @@ if [ 'amd64' = "$ARCH" ] ; then ARCH="x86_64" fi -DIB_RELEASE=${DIB_RELEASE:-latest} +DIB_RELEASE=${DIB_RELEASE:-"6.5-20140121.0"} 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-$DIB_RELEASE.x86_64.qcow2} BASE_IMAGE_TAR=$DIB_RELEASE-rhel-server-$ARCH-latest.tgz CACHED_TAR=$DIB_IMAGE_CACHE/$BASE_IMAGE_TAR