openstack
/
diskimage-builder
Code Issues Proposed changes

Revert "Revert "Ensure DIB_RELEASE is exported for fedora"" 

This reverts commit 7a4c396948.

Note this time it sets it to F21, not F22, and gets rid of the
duplicate definition that doesn't get exported.

Change-Id: I240ad25d7a73c379559517a2a8399ae8c098314b
This commit is contained in:
Ian Wienand 2015-06-12 15:49:16 +10:00
parent d711b5fefb
commit 19f769f049
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/fedora/environment.d/10-fedora-distro-name.bash
View File

@ -1 +1,2 @@
export DISTRO_NAME=fedora
export DIB_RELEASE=${DIB_RELEASE:-21}

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

@ -23,7 +23,7 @@ if [ -n "$DIB_LOCAL_IMAGE" ]; then
BASE_IMAGE_FILE=`basename $DIB_LOCAL_IMAGE`
BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
else
DIB_RELEASE=${DIB_RELEASE:-21}
# note default DIB_RELEASE set in environment setup
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.fedoraproject.org}
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-fedora-$DIB_RELEASE.$ARCH.qcow2}
BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-$DIB_RELEASE.tgz