summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-06 00:38:31 +0000
committerGerrit Code Review <review@openstack.org>2014-03-06 00:38:31 +0000
commit86fc79ebb7aef2ea615e97e174f594baa525d703 (patch)
tree0ec396290acfa88295f3c5ce6c05045f5b5d0abe
parentc540162567b76e231f7d42a2d67088962ee5a97f (diff)
parentd3e3182517e4f8f00e704a9c89399aaca9853655 (diff)
Merge "Fix DIB_HADOOP_VERSION checks of hadoop-cdh element"2014.1.b3
-rwxr-xr-xelements/hadoop-cdh/post-install.d/40-setup-hadoop4
-rwxr-xr-xelements/hadoop-cdh/root.d/0-check7
2 files changed, 2 insertions, 9 deletions
diff --git a/elements/hadoop-cdh/post-install.d/40-setup-hadoop b/elements/hadoop-cdh/post-install.d/40-setup-hadoop
index a885328..525f1b3 100755
--- a/elements/hadoop-cdh/post-install.d/40-setup-hadoop
+++ b/elements/hadoop-cdh/post-install.d/40-setup-hadoop
@@ -10,10 +10,6 @@ if [ "$distro" != "Ubuntu" ]; then
10 exit 1 10 exit 1
11fi 11fi
12 12
13if [ $DIB_HADOOP_VERSION != "2.0.0-mr1-cdh4.5.0" ]; then
14 echo "CDH version $DIB_HADOOP_VERSION not supported. Exiting."
15fi
16
17echo "Hadoop CDH setup begins for $distro" 13echo "Hadoop CDH setup begins for $distro"
18tmp_dir=/tmp/hadoop 14tmp_dir=/tmp/hadoop
19 15
diff --git a/elements/hadoop-cdh/root.d/0-check b/elements/hadoop-cdh/root.d/0-check
index 8f289ca..cb2e262 100755
--- a/elements/hadoop-cdh/root.d/0-check
+++ b/elements/hadoop-cdh/root.d/0-check
@@ -10,10 +10,7 @@ if [ -z "$DIB_HADOOP_VERSION" ]; then
10 echo "DIB_HADOOP_VERSION is not set. Impossible to install hadoop. Exit" 10 echo "DIB_HADOOP_VERSION is not set. Impossible to install hadoop. Exit"
11 exit 1 11 exit 1
12fi 12fi
13version_check=$(echo $DIB_HADOOP_VERSION | sed -e '/[0-9]\.[0-9]\.[0-9]/d') 13if [ $DIB_HADOOP_VERSION != "2.0.0-mr1-cdh4.5.0" ]; then
14if [[ -z $version_check ]]; then 14 echo "CDH version $DIB_HADOOP_VERSION not supported. Exiting."
15 echo "All variables are set, continue."
16else
17 echo "Version error. Exit"
18 exit 1 15 exit 1
19fi 16fi