openstack
/
sahara-extra
Code Issues Proposed changes

Simplification of hadoop_fedora/11-setup-java implementation 

Change-Id: If6a9f6a577fd5cf8426aa86a0155610d7e96dde5
This commit is contained in:
Matthew Farrellee 2013-07-10 09:03:02 -04:00
parent e86ea0234b
commit 4cd9ca4df8
2 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
elements/hadoop_fedora/post-install.d/11-setup-java
View File

@ -1,44 +1,34 @@
#!/bin/bash #!/bin/bash
echo "Java setup begins" echo "Java setup begins"
install-packages wget
tmp_dir=/tmp/java/
mkdir -p $TARGET_ROOT/$tmp_dir
set -e set -e
if [ -z "$JAVA_DOWNLOAD_URL" ]; then
script_dir=$(dirname $0) # NOTE: $(dirname $0) is read-only, use space under $TARGET_ROOT
install -D -g root -o root -m 0755 $script_dir/$JAVA_FILE $TARGET_ROOT/$tmp_dir JAVA_HOME=$TARGET_ROOT/usr/java
filename=$JAVA_FILE mkdir -p $JAVA_HOME
echo "Java file moved"
else if [ -n "$JAVA_DOWNLOAD_URL" ]; then
wget --no-cookies --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com" -P $TARGET_ROOT/$tmp_dir $JAVA_DOWNLOAD_URL install-packages wget
wget --no-cookies --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com" -P $JAVA_HOME $JAVA_DOWNLOAD_URL
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Java is downloading" echo "Java downloaded"
else else
echo "Url error. Exit" echo "Error downloading java. Exiting."
exit 1 exit 1
fi fi
filename=$(find $TARGET_ROOT/$tmp_dir -maxdepth 1 -name "jdk*") JAVA_FILE=$(basename $JAVA_DOWNLOAD_URL)
filename=$(basename $filename) elif [ -n "$JAVA_FILE" ]; then
install -D -g root -o root -m 0755 $(dirname $0)/$JAVA_FILE $JAVA_HOME
fi fi
if echo $tmp_dir/$filename | grep -q -s -F .tar.gz ; then cd $JAVA_HOME
pushd $TARGET_ROOT/$tmp_dir if echo $JAVA_FILE | grep -q -s -F .tar.gz ; then
echo -e "\n" | tar -zxvf $TARGET_ROOT/$tmp_dir/$filename echo -e "\n" | tar -zxvf $JAVA_FILE
popd elif echo $JAVA_FILE | grep -q -s -F .bin ; then
else echo -e "\n" | sh $JAVA_FILE
if echo $filename | grep -q -s -F .bin ; then else
pushd $TARGET_ROOT/$tmp_dir echo "Unknown file type: $JAVA_FILE. Exiting."
echo -e "\n" | sh $filename exit 1
rm $filename
popd
fi
fi fi
rm $JAVA_FILE
filename=$(find $TARGET_ROOT/$tmp_dir -maxdepth 1 -type d -name "jdk*")
filename=$(basename $filename)
javaPath=/usr/java/
mkdir -p $TARGET_ROOT/$javaPath
mv $TARGET_ROOT/$tmp_dir/$filename $TARGET_ROOT/$javaPath
rm -r $tmp_dir
echo "Java was installed" echo "Java was installed"

2
elements/hadoop_fedora/post-install.d/12-setup-hadoop
View File

@ -2,7 +2,7 @@
echo "Hadoop setup begins" echo "Hadoop setup begins"
tmp_dir=/tmp/hadoop tmp_dir=/tmp/hadoop
install-packages openssh-server install-packages openssh-server wget
echo "Creating hadoop user & group" echo "Creating hadoop user & group"
adduser -G adm,wheel hadoop adduser -G adm,wheel hadoop