openstack
/
sahara-image-elements
Code Issues Proposed changes

Fix install Oozie for vanilla 2 plugin 

If you build all images for vanilla plugin then for vanilla 2
image install oozie with hadoop 1. This patch fixed it.

Closes-bug: #1305123

Change-Id: Ic9911b05774b063dc7640d8fdaa684fa7688ae71
This commit is contained in:
Sergey Reshetnyak 2014-04-09 15:48:01 +04:00
parent d87fa27722
commit 2cdd719cd9
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,11 +136,8 @@ popd
if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
export JAVA_DOWNLOAD_URL=${JAVA_DOWNLOAD_URL:-"http://download.oracle.com/otn-pub/java/jdk/7u51-b13/jdk-7u51-linux-x64.tar.gz"}
if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "1" ]; then
export OOZIE_DOWNLOAD_URL=${OOZIE_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0.tar.gz"}
else
export OOZIE_DOWNLOAD_URL=${OOZIE_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0-hadoop-2.3.0.tar.gz"}
fi
export OOZIE_HADOOP_V1_DOWNLOAD_URL=${OOZIE_HADOOP_V1_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0.tar.gz"}
export OOZIE_HADOOP_V2_DOWNLOAD_URL=${OOZIE_HADOOP_V2_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0-hadoop-2.3.0.tar.gz"}
export EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://extjs.com/deploy/ext-2.2.zip"}
export HIVE_VERSION=${HIVE_VERSION:-"0.11.0"}

8
elements/oozie/install.d/50-setup-oozie
View File

@ -6,6 +6,14 @@ install-packages zip unzip tar wget
tmp_dir=/tmp/oozie
mkdir $tmp_dir
if [[ "$DIB_HADOOP_VERSION" < "2.0.0" ]]; then
OOZIE_DOWNLOAD_URL="$OOZIE_HADOOP_V1_DOWNLOAD_URL"
OOZIE_FILE="$OOZIE_HADOOP_V1_FILE"
else
OOZIE_DOWNLOAD_URL="$OOZIE_HADOOP_V2_DOWNLOAD_URL"
OOZIE_FILE="$OOZIE_HADOOP_V2_FILE"
fi
if [ -n "$OOZIE_DOWNLOAD_URL" ]; then
wget -P $tmp_dir $OOZIE_DOWNLOAD_URL
OOZIE_FILE=$(basename $OOZIE_DOWNLOAD_URL)

15
elements/oozie/root.d/0-check
View File

@ -1,9 +1,14 @@
#!/bin/bash
set -e
if [ -z "$OOZIE_DOWNLOAD_URL" ]; then
if [ -z "$OOZIE_FILE" ]; then
echo "OOZIE_FILE and OOZIE_DOWNLOAD_URL are not set. Impossible to install Oozie. Exit"
exit 1
fi
if [[ "$DIB_HADOOP_VERSION" < "2.0.0" ]]; then
if [ -z "$OOZIE_HADOOP_V1_DOWNLOAD_URL" -a -z "$OOZIE_HADOOP_V1_FILE" ]; then
echo "OOZIE_HADOOP_V1_FILE and OOZIE_HADOOP_V1_DOWNLOAD_URL are not set. Impossible to install Oozie. Exit"
exit 1
fi
else
if [ -z "$OOZIE_HADOOP_V2_DOWNLOAD_URL" -a -z "$OOZIE_HADOOP_V2_FILE" ]; then
echo "OOZIE_HADOOP_V2_FILE and OOZIE_HADOOP_V2_DOWNLOAD_URL are not set. Impossible to install Oozie. Exit"
exit 1
fi
fi