openstack/sahara-image-elements
Code Issues Proposed changes

Updating Storm version list

Browse Source 
We are adding Storm 1.2.0 and 1.2.1 and removing 0.9.2

Change-Id: I7e82464dda5d7d9f03e634eef814c63b661bb0c4
This commit is contained in:
Telles Nobrega 2018-06-21 14:50:24 -03:00
parent 93f57b7e3c
commit 34e8f4a27a
3 changed files with 3 additions and 10 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="2.3.0"
# The default version for Storm plugin
DIB_DEFAULT_STORM_VERSION="1.1.0"
DIB_DEFAULT_STORM_VERSION="1.2.1"
# 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|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.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 " [-t 1.0.1|1.1.0|1.1.1|1.2.0|1.2.1]"
echo " [-f qcow2|raw]"
echo " [-d]"
echo " [-u]"
@ -233,7 +233,7 @@ case "$PLUGIN" in
esac
case "$DIB_STORM_VERSION" in
"0.9.2" | "1.0.1" | "1.1.0" | "1.1.1");;
"1.0.1" | "1.1.0" | "1.1.1" | "1.2.0" | "1.2.1");;
"")
echo "Storm version not specified"
echo "Storm ${DIB_DEFAULT_STORM_VERSION} will be used"

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

@ -23,10 +23,6 @@ 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.*)
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

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

@ -17,9 +17,6 @@ echo "Downloading Storm"
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"
;;
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