openstack
/
sahara-image-elements
Code Issues Proposed changes

Merge "Adding Spark 2.3"

This commit is contained in:
Zuul 2018-07-11 23:22:29 +00:00 committed by Gerrit Code Review
parent 2d86783ad2 0421dfb8e5
commit 93f57b7e3c
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ DEBUG_MODE="false"
DIB_DEFAULT_MAPR_VERSION="5.2.0"
# The default version for Spark plugin
DIB_DEFAULT_SPARK_VERSION="2.2.0"
DIB_DEFAULT_SPARK_VERSION="2.3.0"
# The default version for Storm plugin
DIB_DEFAULT_STORM_VERSION="1.1.0"
@ -34,7 +34,7 @@ usage() {
echo " [-i ubuntu|fedora|centos7]"
echo " [-v 2.7.1|2.7.5|2.8.2|3.0.1|5.5|5.7|5.9|5.11|2.2.0.0|2.2.1.0|2.4.2.0]"
echo " [-r 5.1.0|5.2.0]"
echo " [-s 1.3.1|1.6.0|2.1.0|2.2.0]"
echo " [-s 1.6.0|2.1.0|2.2.0|2.3.0]"
echo " [-t 0.9.2|1.0.1|1.1.0|1.1.1]"
echo " [-f qcow2|raw]"
echo " [-d]"
@ -153,7 +153,7 @@ fi
check_spark_version () {
case "$DIB_SPARK_VERSION" in
"1.3.1" | "1.6.0" | "2.1.0" | "2.2.0");;
"1.6.0" | "2.1.0" | "2.2.0" | "2.3.0");;
"")
echo "Spark version not specified"
echo "Spark ${DIB_DEFAULT_SPARK_VERSION} will be used"
@ -475,11 +475,6 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
export DIB_HDFS_LIB_DIR="/opt/hadoop/share/hadoop/tools/lib"
export plugin_type="vanilla"
if [ "$DIB_SPARK_VERSION" = "1.3.1" ]; then
echo "Cannot use Spark 1.3.1 with Vanilla plugin"
exit 1
fi
export DIB_SPARK_VERSION
if [ "$DIB_SPARK_VERSION" = "1.6.0" ]; then
@ -615,7 +610,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "spark" ]; then
export DIB_SPARK_VERSION
export plugin_type="spark"
if [ "$DIB_SPARK_VERSION" = "2.2.0" ]; then
if [ "$DIB_SPARK_VERSION" = "2.2.0" || "$DIB_SPARK_VERSION" = "2.3.0" ]; then
export DIB_CDH_VERSION="5.11"
export DIB_RELEASE=${DIB_RELEASE:-xenial}
else