Merge "Use existing java env"

devstack/entry_points

@@ -124,9 +124,11 @@ function init_opendaylight {
 # install_opendaylight() - Collect source and prepare
 function install_opendaylight {
     echo "Installing OpenDaylight and dependent packages"
-
-    if ! setup_java "${ODL_REQUIRED_JAVA_VERSION:-7}"; then
-        exit 1
+    if [[ "$ODL_USING_EXISTING_JAVA" != "True" ]]
+    then
+        if ! setup_java "${ODL_REQUIRED_JAVA_VERSION:-7}"; then
+            exit 1
+        fi
     fi
 
     install_opendaylight_neutron_thin_ml2_driver

devstack/plugin.sh

@@ -33,6 +33,12 @@ source $NETWORKING_ODL_DIR/devstack/setup_java.sh
 source $NETWORKING_ODL_DIR/devstack/entry_points
 
 
+if [[ "$ODL_USING_EXISTING_JAVA" == "True" ]]
+then
+    echo 'Using installed java.'
+    java -version || exit 1
+fi
+
 # main loop
 if is_service_enabled odl-server; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then

devstack/settings.odl

@@ -72,6 +72,9 @@ ODL_KARAF_LOG_NAME=$ODL_KARAF_LOG_BASE.$ODL_KARAF_LOG_DATE
 # The bridge to configure
 OVS_BR=${OVS_BR:-br-int}
 
+# Use the existing ready java env
+ODL_USING_EXISTING_JAVA=${ODL_USING_EXISTING_JAVA:-False}
+
 # Allow the min/max/perm Java memory to be configurable
 ODL_JAVA_MIN_MEM=${ODL_JAVA_MIN_MEM:-256m}
 ODL_JAVA_MAX_MEM=${ODL_JAVA_MAX_MEM:-512m}