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

Update rhel7 element readme

Browse Source 
Evidently the readme file hasn't been updated since rhel7 finished
beta, so this is long overdue.

In addition, since it's not possible to download the base image
file directly, let's stop pretending we can and bail out if the user
didn't set the necessary env vars.

Also updated the README to use the new table format instead of free text

Co-Authored-By: Augustina Ragwitz <aragwitz+lp@pobox.com>
Change-Id: Ie8343ee2ce1715583c28de7f59daed7e58c8ca0f
This commit is contained in:
Ben Nemec 2015-09-10 15:09:48 -05:00
parent b544e91494
commit e23274921d
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
elements/rhel7/README.rst
View File

@ -3,9 +3,30 @@ rhel7
===== =====
Use RHEL 7 cloud images as the baseline for built disk images. Use RHEL 7 cloud images as the baseline for built disk images.
Note: As of this writing, RHEL 7 is still in beta, so final download Because RHEL 7 base images are not publicly available, it is necessary to first
locations are not available. This element defaults to using the RHEL 6.5 download the RHEL 7 cloud image from the Red Hat Customer Portal and pass the
image, but that will need to be overridden using the appropriate DIB_* path to the resulting file to disk-image-create as the ``DIB_LOCAL_IMAGE``
environment variables to point at a RHEL 7 image. environment variable.
For further details see the redhat-common README. The cloud image can be found at (login required):
https://access.redhat.com/downloads/content/69/ver=/rhel---7/7.1/x86_64/product-downloads
Then before running the image build, define DIB_LOCAL_IMAGE (replace the file
name with the one downloaded, if it differs from the example)::
export DIB_LOCAL_IMAGE=rhel-guest-image-7.1-20150224.0.x86_64.qcow2
The downloaded file will then be used as the basis for any subsequent image
builds.
For further details about building RHEL 7 images, see the rhel-common and
redhat-common element README files.
Environment Variables
---------------------
DIB_LOCAL_IMAGE
:Required: Yes
:Default: None
:Description: The RHEL 7 base image you have downloaded. See the element
description above for more details.
:Example: ``DIB_LOCAL_IMAGE=/tmp/rhel7-cloud.qcow2``

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

@ -26,9 +26,12 @@ if [ -n "$DIB_LOCAL_IMAGE" ]; then
BASE_IMAGE_FILE=`basename $DIB_LOCAL_IMAGE` BASE_IMAGE_FILE=`basename $DIB_LOCAL_IMAGE`
BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
else else
if [ -z "${BASE_IMAGE_FILE:-}" -o -z "${DIB_CLOUD_IMAGES}" ]; then
echo "No source for a base image file configured."
echo "See rhel7 element readme for details on how to obtain and use a base image."
exit 1
fi
DIB_RELEASE=${DIB_RELEASE:-latest} DIB_RELEASE=${DIB_RELEASE:-latest}
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://rhn.redhat.com}
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