openstack/sahara-image-elements
Code Issues Proposed changes

Adding ability to create Storm 1.1.0 image

Browse Source 
Change-Id: I5d0c5c600fda5d54d2b6bb8cac9b0f44c24f691a
This commit is contained in:
Telles Nobrega 2017-04-04 11:39:57 -03:00
parent 2113ac4861
commit 5e1f45c373
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ DIB_DEFAULT_MAPR_VERSION="5.2.0"
DIB_DEFAULT_SPARK_VERSION="1.6.0"
# The default version for Storm plugin
DIB_DEFAULT_STORM_VERSION="1.0.1"
DIB_DEFAULT_STORM_VERSION="1.1.0"
# Bare metal image generation is enabled with the -b flag, it is off by default
SIE_BAREMETAL="false"
@ -35,7 +35,7 @@ usage() {
echo " [-v 2.7.1|5.5|5.7|5.9|2.2.0.0|2.2.1.0]"
echo " [-r 5.1.0|5.2.0]"
echo " [-s 1.3.1|1.6.0]"
echo " [-t 0.9.2|1.0.1]"
echo " [-t 0.9.2|1.0.1|1.1.0]"
echo " [-d]"
echo " [-u]"
echo " [-j openjdk|oracle-java]"
@ -237,7 +237,7 @@ case "$PLUGIN" in
esac
case "$DIB_STORM_VERSION" in
"0.9.2" | "1.0.1");;
"0.9.2" | "1.0.1" | "1.1.0");;
"")
echo "Storm version not specified"
echo "Storm ${DIB_DEFAULT_STORM_VERSION} will be used"

3
elements/storm/install.d/60-storm
View File

@ -20,13 +20,14 @@ chage -I -1 -E -1 -m -1 -M -1 -W -1 -E -1 storm
echo "Extracting Storm"
# The user is not providing his own Storm distribution package
if [ -z "${STORM_DOWNLOAD_URL:-}" ]; then
# Check storm version
case "$DIB_STORM_VERSION" in
0.9.*)
STORM_DOWNLOAD_URL="http://archive.apache.org/dist/incubator/storm/apache-storm-$DIB_STORM_VERSION-incubating/apache-storm-$DIB_STORM_VERSION-incubating.tar.gz"
STORM_FOLDER=apache-storm-$DIB_STORM_VERSION-incubating
;;
1.0.*)
1.*)
STORM_DOWNLOAD_URL="https://archive.apache.org/dist/storm/apache-storm-$DIB_STORM_VERSION/apache-storm-$DIB_STORM_VERSION.tar.gz"
STORM_FOLDER=apache-storm-$DIB_STORM_VERSION
;;

2
elements/storm/root.d/50-download-storm
View File

@ -20,7 +20,7 @@ if [ -z "${STORM_DOWNLOAD_URL:-}" ]; then
0.9.*)
STORM_DOWNLOAD_URL="http://archive.apache.org/dist/incubator/storm/apache-storm-$DIB_STORM_VERSION-incubating/apache-storm-$DIB_STORM_VERSION-incubating.tar.gz"
;;
1.0.*)
1.*)
STORM_DOWNLOAD_URL="https://archive.apache.org/dist/storm/apache-storm-$DIB_STORM_VERSION/apache-storm-$DIB_STORM_VERSION.tar.gz"
echo $STORM_DOWNLOAD_URL
;;