openstack/sahara-image-elements
Code Issues Proposed changes

Merge "Fix DIB_HADOOP_VERSION checks of hadoop-cdh element"

Browse Source
This commit is contained in:
Jenkins 2014-03-06 00:38:31 +00:00 committed by Gerrit Code Review
commit 86fc79ebb7
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/hadoop-cdh/post-install.d/40-setup-hadoop
View File

@ -10,10 +10,6 @@ if [ "$distro" != "Ubuntu" ]; then
exit 1
fi
if [ $DIB_HADOOP_VERSION != "2.0.0-mr1-cdh4.5.0" ]; then
echo "CDH version $DIB_HADOOP_VERSION not supported. Exiting."
fi
echo "Hadoop CDH setup begins for $distro"
tmp_dir=/tmp/hadoop

7
elements/hadoop-cdh/root.d/0-check
View File

@ -10,10 +10,7 @@ if [ -z "$DIB_HADOOP_VERSION" ]; then
echo "DIB_HADOOP_VERSION is not set. Impossible to install hadoop. Exit"
exit 1
fi
version_check=$(echo $DIB_HADOOP_VERSION | sed -e '/[0-9]\.[0-9]\.[0-9]/d')
if [[ -z $version_check ]]; then
echo "All variables are set, continue."
else
echo "Version error. Exit"
if [ $DIB_HADOOP_VERSION != "2.0.0-mr1-cdh4.5.0" ]; then
echo "CDH version $DIB_HADOOP_VERSION not supported. Exiting."
exit 1
fi