Set controller java version in bin/setenv so that bin/start always works
Set VM java version with alternatives so other java applications work too
The above is set from variable ${JAVA_HOME} injected from bundle_vars.txt
Change-Id: I25307c46e6c7435a6f8005eb22f7aa9a49c55351
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
echo "Dump module-shards.conf"
cat ${MODULESHARDSCONF}
echo "Dump module-shards.conf"
cat ${MODULESHARDSCONF}
+echo "Set Java version"
+sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1
+sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java
+echo "JDK default version ..."
+java -version
+
echo "Set JAVA_HOME"
export JAVA_HOME="${JAVA_HOME}"
# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
echo "Set JAVA_HOME"
export JAVA_HOME="${JAVA_HOME}"
# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
-echo "JDK default version ..."
-java -version
echo "Starting controller..."
/tmp/${BUNDLEFOLDER}/bin/start
echo "Starting controller..."
/tmp/${BUNDLEFOLDER}/bin/start
sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
cat \${LOGCONF}
sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
cat \${LOGCONF}
-echo "Configure max memory..."
+echo "Configure java home and max memory..."
MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
+sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' \${MEMCONF}
sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
cat \${MEMCONF}
echo "Listing all open ports on controller system..."
netstat -natu
sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
cat \${MEMCONF}
echo "Listing all open ports on controller system..."
netstat -natu
+echo "Set Java version"
+sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1
+sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java
+echo "JDK default version ..."
+java -version
+
echo "Set JAVA_HOME"
export JAVA_HOME="$JAVA_HOME"
# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
echo "Set JAVA_HOME"
export JAVA_HOME="$JAVA_HOME"
# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
-echo "JDK default version ..."
-java -version
echo "Starting controller..."
/tmp/${BUNDLEFOLDER}/bin/start
echo "Starting controller..."
/tmp/${BUNDLEFOLDER}/bin/start
sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
cat \${LOGCONF}
sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
cat \${LOGCONF}
-echo "Configure max memory..."
+echo "Configure java home and max memory..."
MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
+sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' \${MEMCONF}
sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
cat \${MEMCONF}
sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
cat \${MEMCONF}
for i in `seq 1 ${NUM_ODL_SYSTEM}`
do
for i in `seq 1 ${NUM_ODL_SYSTEM}`
do
- CONTROLLERIP=ODL_SYSTEM_${i}_IP
+ CONTROLLERIP=ODL_SYSTEM_${i}_IP
echo "Installing distribution in member-${i} with IP address ${!CONTROLLERIP}"
scp ${WORKSPACE}/deploy-controller-script.sh ${!CONTROLLERIP}:/tmp
ssh ${!CONTROLLERIP} 'bash /tmp/deploy-controller-script.sh'
echo "Installing distribution in member-${i} with IP address ${!CONTROLLERIP}"
scp ${WORKSPACE}/deploy-controller-script.sh ${!CONTROLLERIP}:/tmp
ssh ${!CONTROLLERIP} 'bash /tmp/deploy-controller-script.sh'