openstack/sahara-image-elements
Code Issues Proposed changes

Merge "Added support of Spark 1.6.0"

Browse Source
This commit is contained in:
Jenkins
2016-02-15 06:50:34 +00:00
committed by Gerrit Code Review
parent 4d1b544e65 3626fb6429
commit 00a7d7c4e4
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
diskimage-create/README.rst
View File

@@ -41,7 +41,13 @@ NOTE: Do not create all images for all plugins with the same mirrors. Different
tox -e venv -- sahara-image-create -i [ubuntu|fedora|centos|centos7]
7. If the host system is missing packages required for diskimage-create.sh, the '-u' commandline option will instruct the script to install them without prompt.
7. To select which Spark version to target use the '-s' commandline option like this:
.. sourcecode:: bash
tox -e venv -- sahara-image-create -p spark -s [1.3.1|1.6.0]
8. If the host system is missing packages required for diskimage-create.sh, the '-u' commandline option will instruct the script to install them without prompt.
NOTE for 4, 5, 6:

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

@@ -13,7 +13,7 @@ DEBUG_MODE="false"
DIB_DEFAULT_MAPR_VERSION="5.0.0"
# The default version for Spark plugin
DIB_DEFAULT_SPARK_VERSION="1.3.1"
DIB_DEFAULT_SPARK_VERSION="1.6.0"
# Bare metal image generation is enabled with the -b flag, it is off by default
SIE_BAREMETAL="false"
@@ -31,7 +31,7 @@ usage() {
echo " [-i ubuntu|fedora|centos|centos7]"
echo " [-v 2|2.6|2.7.1|4|5.0|5.3|5.4|5.5]"
echo " [-r 3.1.1|4.0.1|4.0.2|5.0.0]"
echo " [-s <Spark version>]"
echo " [-s 1.3.1|1.6.0]"
echo " [-d]"
echo " [-u]"
echo " [-j openjdk|oracle-java]"
@@ -545,6 +545,9 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "spark" ]; then
echo "Overriding CDH version, CDH 4 is required for this Spark version"
export DIB_CDH_VERSION="CDH4"
ubuntu_elements_sequence="$COMMON_ELEMENTS hadoop-cdh"
elif [ "$DIB_SPARK_VERSION" == "1.6.0" ]; then
export DIB_CDH_VERSION="5.4"
ubuntu_elements_sequence="$COMMON_ELEMENTS hadoop-cloudera"
else
export DIB_CDH_VERSION=$HADOOP_VERSION
ubuntu_elements_sequence="$COMMON_ELEMENTS hadoop-cloudera"

10
elements/hadoop-cloudera/install.d/50-install-cloudera
View File

@@ -70,10 +70,12 @@ case "$DIB_CDH_VERSION" in
;;
5.4)
wget -O $dest $HADOOP_OPENSTACK_5_4_0_URL
# Create links to keep backward version support.
ln -s /usr/lib/oozie/oozie-sharelib-yarn /usr/lib/oozie/oozie-sharelib-yarn.tar.gz
ln -s /usr/lib/oozie/oozie-sharelib-mr1 /usr/lib/oozie/oozie-sharelib-mr1.tar.gz
ln -s /usr/lib/oozie/oozie-sharelib-yarn.tar.gz /usr/lib/oozie/oozie-sharelib.tar.gz
if [ -z "${DIB_CDH_HDFS_ONLY:-}" ]; then
# Create links to keep backward version support.
ln -s /usr/lib/oozie/oozie-sharelib-yarn /usr/lib/oozie/oozie-sharelib-yarn.tar.gz
ln -s /usr/lib/oozie/oozie-sharelib-mr1 /usr/lib/oozie/oozie-sharelib-mr1.tar.gz
ln -s /usr/lib/oozie/oozie-sharelib-yarn.tar.gz /usr/lib/oozie/oozie-sharelib.tar.gz
fi
;;
5.5)
wget -O $dest $HADOOP_OPENSTACK_5_5_0_URL