openstack/sahara-image-elements
Code Issues Proposed changes

Merge "Fix version CentOS in name of images with CentOS"

Browse Source
This commit is contained in:
Jenkins 2015-04-28 14:07:50 +00:00 committed by Gerrit Code Review
commit 3850d6fcdb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,7 +490,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then
# Ignoring image type option
if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "1" ]; then
export centos_image_name_hdp_1_3=${centos_hdp_hadoop_1_image_name:-"centos-6_5-64-hdp-1-3"}
export centos_image_name_hdp_1_3=${centos_hdp_hadoop_1_image_name:-"centos-6_6-64-hdp-1-3"}
# Elements to include in an HDP-based image
centos_elements_sequence="vm rhel hadoop-hdp redhat-lsb yum $JAVA_ELEMENT updater epel"
if [ "$DEBUG_MODE" = "true" ]; then
@ -509,7 +509,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then
fi
if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2" ]; then
export centos_image_name_hdp_2_0=${centos_hdp_hadoop_2_image_name:-"centos-6_5-64-hdp-2-0"}
export centos_image_name_hdp_2_0=${centos_hdp_hadoop_2_image_name:-"centos-6_6-64-hdp-2-0"}
# Elements to include in an HDP-based image
centos_elements_sequence="vm rhel hadoop-hdp redhat-lsb yum $JAVA_ELEMENT updater epel"
if [ "$DEBUG_MODE" = "true" ]; then
@ -528,7 +528,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then
fi
if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "plain" ]; then
export centos_image_name_plain=${centos_hdp_plain_image_name:-"centos-6_5-64-plain"}
export centos_image_name_plain=${centos_hdp_plain_image_name:-"centos-6_6-64-plain"}
# Elements for a plain CentOS image that does not contain HDP or Apache Hadoop
centos_plain_elements_sequence="vm rhel redhat-lsb disable-firewall disable-selinux ssh sahara-version yum $JAVA_ELEMENT epel"
if [ "$DEBUG_MODE" = "true" ]; then