summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTelles Nobrega <tenobreg@redhat.com>2018-06-21 14:50:24 -0300
committerTelles Nobrega <tenobreg@redhat.com>2018-07-12 15:24:42 -0300
commit34e8f4a27a3cf9cc894922e4c870fcf192d1e886 (patch)
treeecaffb1a5b9595ca701428f436c8dd8291ba342f
parent93f57b7e3c3c40242df42e035ef984f84860f180 (diff)
Updating Storm version listHEADmaster
We are adding Storm 1.2.0 and 1.2.1 and removing 0.9.2 Change-Id: I7e82464dda5d7d9f03e634eef814c63b661bb0c4
Notes
Notes (review): Code-Review+2: Jeremy Freudberg <jeremyfreudberg@gmail.com> Code-Review+2: Luigi Toscano <ltoscano@redhat.com> Workflow+1: Luigi Toscano <ltoscano@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 12 Jul 2018 21:40:25 +0000 Reviewed-on: https://review.openstack.org/577826 Project: openstack/sahara-image-elements Branch: refs/heads/master
-rwxr-xr-xdiskimage-create/diskimage-create.sh6
-rwxr-xr-xelements/storm/install.d/60-storm4
-rwxr-xr-xelements/storm/root.d/50-download-storm3
3 files changed, 3 insertions, 10 deletions
diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 9d232cc..e755039 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -16,7 +16,7 @@ DIB_DEFAULT_MAPR_VERSION="5.2.0"
16DIB_DEFAULT_SPARK_VERSION="2.3.0" 16DIB_DEFAULT_SPARK_VERSION="2.3.0"
17 17
18# The default version for Storm plugin 18# The default version for Storm plugin
19DIB_DEFAULT_STORM_VERSION="1.1.0" 19DIB_DEFAULT_STORM_VERSION="1.2.1"
20 20
21# Bare metal image generation is enabled with the -b flag, it is off by default 21# Bare metal image generation is enabled with the -b flag, it is off by default
22SIE_BAREMETAL="false" 22SIE_BAREMETAL="false"
@@ -35,7 +35,7 @@ usage() {
35 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]" 35 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]"
36 echo " [-r 5.1.0|5.2.0]" 36 echo " [-r 5.1.0|5.2.0]"
37 echo " [-s 1.6.0|2.1.0|2.2.0|2.3.0]" 37 echo " [-s 1.6.0|2.1.0|2.2.0|2.3.0]"
38 echo " [-t 0.9.2|1.0.1|1.1.0|1.1.1]" 38 echo " [-t 1.0.1|1.1.0|1.1.1|1.2.0|1.2.1]"
39 echo " [-f qcow2|raw]" 39 echo " [-f qcow2|raw]"
40 echo " [-d]" 40 echo " [-d]"
41 echo " [-u]" 41 echo " [-u]"
@@ -233,7 +233,7 @@ case "$PLUGIN" in
233 esac 233 esac
234 234
235 case "$DIB_STORM_VERSION" in 235 case "$DIB_STORM_VERSION" in
236 "0.9.2" | "1.0.1" | "1.1.0" | "1.1.1");; 236 "1.0.1" | "1.1.0" | "1.1.1" | "1.2.0" | "1.2.1");;
237 "") 237 "")
238 echo "Storm version not specified" 238 echo "Storm version not specified"
239 echo "Storm ${DIB_DEFAULT_STORM_VERSION} will be used" 239 echo "Storm ${DIB_DEFAULT_STORM_VERSION} will be used"
diff --git a/elements/storm/install.d/60-storm b/elements/storm/install.d/60-storm
index cf89a4b..1a11e25 100755
--- a/elements/storm/install.d/60-storm
+++ b/elements/storm/install.d/60-storm
@@ -23,10 +23,6 @@ if [ -z "${STORM_DOWNLOAD_URL:-}" ]; then
23 23
24# Check storm version 24# Check storm version
25 case "$DIB_STORM_VERSION" in 25 case "$DIB_STORM_VERSION" in
26 0.9.*)
27 STORM_DOWNLOAD_URL="http://archive.apache.org/dist/incubator/storm/apache-storm-$DIB_STORM_VERSION-incubating/apache-storm-$DIB_STORM_VERSION-incubating.tar.gz"
28 STORM_FOLDER=apache-storm-$DIB_STORM_VERSION-incubating
29 ;;
30 1.*) 26 1.*)
31 STORM_DOWNLOAD_URL="https://archive.apache.org/dist/storm/apache-storm-$DIB_STORM_VERSION/apache-storm-$DIB_STORM_VERSION.tar.gz" 27 STORM_DOWNLOAD_URL="https://archive.apache.org/dist/storm/apache-storm-$DIB_STORM_VERSION/apache-storm-$DIB_STORM_VERSION.tar.gz"
32 STORM_FOLDER=apache-storm-$DIB_STORM_VERSION 28 STORM_FOLDER=apache-storm-$DIB_STORM_VERSION
diff --git a/elements/storm/root.d/50-download-storm b/elements/storm/root.d/50-download-storm
index ff0e544..ea77fc6 100755
--- a/elements/storm/root.d/50-download-storm
+++ b/elements/storm/root.d/50-download-storm
@@ -17,9 +17,6 @@ echo "Downloading Storm"
17if [ -z "${STORM_DOWNLOAD_URL:-}" ]; then 17if [ -z "${STORM_DOWNLOAD_URL:-}" ]; then
18# Check storm version 18# Check storm version
19 case "$DIB_STORM_VERSION" in 19 case "$DIB_STORM_VERSION" in
20 0.9.*)
21 STORM_DOWNLOAD_URL="http://archive.apache.org/dist/incubator/storm/apache-storm-$DIB_STORM_VERSION-incubating/apache-storm-$DIB_STORM_VERSION-incubating.tar.gz"
22 ;;
23 1.*) 20 1.*)
24 STORM_DOWNLOAD_URL="https://archive.apache.org/dist/storm/apache-storm-$DIB_STORM_VERSION/apache-storm-$DIB_STORM_VERSION.tar.gz" 21 STORM_DOWNLOAD_URL="https://archive.apache.org/dist/storm/apache-storm-$DIB_STORM_VERSION/apache-storm-$DIB_STORM_VERSION.tar.gz"
25 echo $STORM_DOWNLOAD_URL 22 echo $STORM_DOWNLOAD_URL