openstack/sahara-image-elements
Code Issues Proposed changes

Revert "Fix centos7 building image"

Browse Source 
1.1.0 version of DIB was released

This reverts commit 53627f187b.

Change-Id: I210105acfbd4d8646a6259a2db92be79257a9efd
This commit is contained in:
Vitaly Gridnev
2015-08-25 15:09:11 +00:00
parent f02b223a4c
commit 2fb3c7e2e8
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
diskimage-create/diskimage-create.sh
View File

@@ -479,22 +479,18 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
# CentOS 7 cloud image
if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "centos7" ]; then
export DIB_EXTLINUX=1
if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.6" ]; then
export DIB_RELEASE="GenericCloud"
export DIB_EXTLINUX=1
export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_6:-"2.6.0"}
export centos7_image_name=${centos7_vanilla_hadoop_2_6_image_name:-"centos7_sahara_vanilla_hadoop_2_6_latest$suffix"}
disk-image-create $TRACING $centos7_elements_sequence -o $centos7_image_name
unset DIB_RELEASE DIB_EXTLINUX
fi
if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.7.1" ]; then
export DIB_RELEASE="GenericCloud"
export DIB_EXTLINUX=1
export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_7_1:-"2.7.1"}
export centos7_image_name=${centos7_vanilla_hadoop_2_7_1_image_name:-"centos7_sahara_vanilla_hadoop_2_7_1_latest$suffix"}
disk-image-create $TRACING $centos7_elements_sequence -o $centos7_image_name
unset DIB_RELEASE DIB_EXTLINUX
fi
unset DIB_EXTLINUX
fi
fi