From f555a915a65e063496cda629d004a8a94dc193b7 Mon Sep 17 00:00:00 2001 From: Valeriy Ponomaryov Date: Thu, 29 Sep 2016 20:15:38 +0300 Subject: [PATCH] Install java8 if Ubuntu Xenial is used java7 is absent on Ubuntu Xenial and Hadoop 2.7.x+ is expected to work on java8. So, use java8 on Ubuntu Xenial and java7 on old Ubuntu Trusty. Change-Id: I64338c5c146e548f1b1ba2b1b1f1d5f76992b8e0 --- devstack/lib/hdfs-functions.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/devstack/lib/hdfs-functions.sh b/devstack/lib/hdfs-functions.sh index 96bc564..63db74a 100644 --- a/devstack/lib/hdfs-functions.sh +++ b/devstack/lib/hdfs-functions.sh @@ -16,9 +16,17 @@ function install_hdfs { cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys if [[ -z $JAVA_HOME ]]; then - install_package openjdk-7-jre openjdk-7-jdk + if is_ubuntu; then + if [[ $(lsb_release -s -d) == *"14.04"* ]]; then + JAVA_VERSION=7 + elif [[ $(lsb_release -s -d) == *"16.04"* ]]; then + JAVA_VERSION=8 + fi + fi + JAVA_VERSION=${JAVA_VERSION:-7} + install_package openjdk-${JAVA_VERSION}-jre openjdk-${JAVA_VERSION}-jdk # Export JAVA_HOME - sed -i '1 s/^/export JAVA_HOME=\/usr\/lib\/jvm\/java-7-openjdk-amd64\n/' ~/.bashrc + sed -i "1 s/^/export JAVA_HOME=\/usr\/lib\/jvm\/java-${JAVA_VERSION}-openjdk-amd64\n/" ~/.bashrc source ~/.bashrc fi