Merge pull request #1157 from oracle/tbarnes-home-defaults

smarter defaulting for ORACLE_HOME, MW_HOME, and WL_HOME

Author: rjeberhard

operator/src/main/resources/scripts/introspectDomain.sh

@@ -28,9 +28,10 @@
 #
 # Prerequisites:
 #
-#    - Optionally set WL_HOME - default is /u01/oracle/wlserver.
-#
-#    - Optionally set MW_HOME - default is /u01/oracle.
+#    - Optionally set
+#        ORACLE_HOME = Oracle Install Home - defaults via utils.sh/exportInstallHomes
+#        MW_HOME     = MiddleWare Install Home - defaults to ${ORACLE_HOME}
+#        WL_HOME     = WebLogic Install Home - defaults to ${ORACLE_HOME}/wlserver
 #
 #    - Transitively requires other env vars for startNodeManager.sh, wlst.sh,
 #      and introspectDomain.py (see these scripts to find out what else needs to be set).
@@ -47,10 +48,9 @@ trace "Introspecting the domain"
 
 env | tracePipe "Current environment:"
 
-# set defaults
+# set ORACLE_HOME/WL_HOME/MW_HOME to defaults if needed
 
-export WL_HOME=${WL_HOME:-/u01/oracle/wlserver}
-export MW_HOME=${MW_HOME:-/u01/oracle}
+exportInstallHomes
 
 # check if prereq env-vars, files, and directories exist
 

operator/src/main/resources/scripts/startNodeManager.sh

@@ -19,7 +19,9 @@
 #
 #   SERVER_NAME       = If not set, assumes this is introspector.
 #
-#   WL_HOME           = WebLogic Install Home - defaults to /u01/oracle/wlserver
+#   ORACLE_HOME       = Oracle Install Home - defaults via utils.sh/exportInstallHomes
+#   MW_HOME           = MiddleWare Install Home - defaults to ${ORACLE_HOME}
+#   WL_HOME           = WebLogic Install Home - defaults to ${ORACLE_HOME}/wlserver
 #
 #   NODEMGR_LOG_HOME  = Directory that will contain contain both
 #                          ${DOMAIN_UID}/${SERVER_NAME}_nodemanager.log
@@ -50,7 +52,8 @@ SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 source ${SCRIPTPATH}/utils.sh 
 [ $? -ne 0 ] && echo "[SEVERE] Missing file ${SCRIPTPATH}/utils.sh" && exit 1 
 
-export WL_HOME="${WL_HOME:-/u01/oracle/wlserver}"
+# Set ORACLE_HOME/WL_HOME/MW_HOME to defaults if needed
+exportInstallHomes
 
 stm_script=${WL_HOME}/server/bin/startNodeManager.sh
 
@@ -59,7 +62,7 @@ ADMIN_PORT_SECURE=${ADMIN_PORT_SECURE:-false}
 
 trace "Starting node manager for domain-uid='$DOMAIN_UID' and server='$SERVER_NAME'."
 
-checkEnv JAVA_HOME NODEMGR_HOME DOMAIN_HOME DOMAIN_UID WL_HOME || exit 1
+checkEnv JAVA_HOME NODEMGR_HOME DOMAIN_HOME DOMAIN_UID ORACLE_HOME MW_HOME WL_HOME || exit 1
 
 if [ "${SERVER_NAME}" = "introspector" ]; then
   SERVICE_NAME=localhost

operator/src/main/resources/scripts/utils.sh

@@ -3,17 +3,32 @@
 
 #
 # Purpose:
-#   Define a trace function that matches the format of the trace function
-#   in utils.py and of the logging in the java operator.
-#
-#   Also define various shared utility functions.
+#   Defines various shared utility functions, including a trace function.
 #
 # Load this file via the following pattern:
 #   SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 #   source ${SCRIPTPATH}/utils.sh
 #   [ $? -ne 0 ] && echo "[SEVERE] Missing file ${SCRIPTPATH}/utils.sh" && exit 1
 #
 
+# exportInstallHomes
+#   purpose:  export MW_HOME, WL_HOME, ORACLE_HOME
+#             with defaults as needed 
+function exportInstallHomes() {
+  export ORACLE_HOME=${ORACLE_HOME:-${MW_HOME}}
+
+  if [ -z ${ORACLE_HOME} ]; then
+    if [ -z ${WL_HOME} ]; then
+      export ORACLE_HOME='/u01/oracle'
+    else
+      export ORACLE_HOME="`dirname ${WL_HOME}`"
+    fi
+  fi
+
+  export WL_HOME=${WL_HOME:-${ORACLE_HOME}/wlserver}
+  export MW_HOME=${MW_HOME:-${ORACLE_HOME}}
+}
+
 # timestamp
 #   purpose:  echo timestamp in the form yyyymmddThh:mm:ss.mmm ZZZ
 #   example:  20181001T14:00:00.001 UTC
@@ -88,6 +103,11 @@ function trace() {
     else
       logLoc="`basename $0`:${BASH_LINENO[0]}"
     fi
+  else
+    if [ "$1" = "-cloc" ]; then
+      shift
+      shift
+    fi
   fi
 
   local logMode='-normal'
@@ -207,7 +227,7 @@ function checkEnv() {
 
 #
 # exportEffectiveDomainHome
-#   if DOMAIN_HOME='/u01/oracle/user_projects/domains':
+#   if DOMAIN_HOME='${ORACLE_HOME}/user_projects/domains':
 #     1) look for a config.xml in DOMAIN_HOME/config and
 #        and in DOMAIN_HOME/*/config
 #     2) Export DOMAIN_HOME to reflect the actual location 
@@ -219,7 +239,9 @@ function exportEffectiveDomainHome() {
   local eff_domain_home=""
   local found_configs=""
 
-  if [ ! "${DOMAIN_HOME?}" = "/u01/oracle/user_projects/domains" ]; then
+  exportInstallHomes
+
+  if [ ! "${DOMAIN_HOME?}" = "${ORACLE_HOME}/user_projects/domains" ]; then
     # nothing to do
     return 0
   fi

operator/src/main/resources/scripts/wlst.sh

@@ -9,8 +9,10 @@
 #
 # Input env vars:
 #    - JAVA_HOME - required
-#    - WL_HOME - optional - default is /u01/oracle/wlserver
-#    - MW_HOME - optional - default is /u01/oracle
+#    - Optionally set
+#        ORACLE_HOME = Oracle Install Home - defaults via utils.sh/exportInstallHomes
+#        MW_HOME     = MiddleWare Install Home - defaults to ${ORACLE_HOME}
+#        WL_HOME     = WebLogic Install Home - defaults to ${ORACLE_HOME}/wlserver
 #
 # Usage:
 #   SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
@@ -25,10 +27,11 @@ wlst_script=${1?}
 
 trace "About to run wlst script '${wlst_script}'"
 
-export WL_HOME=${WL_HOME:-/u01/oracle/wlserver}
-export MW_HOME=${MW_HOME:-/u01/oracle}
+# Set ORACLE_HOME/WL_HOME/MW_HOME to defaults if needed
+exportInstallHomes
 
 checkEnv JAVA_HOME \
+         ORACLE_HOME \
          WL_HOME \
          MW_HOME \
          || exit 1
@@ -40,7 +43,7 @@ wlst_loc1="${WL_HOME}/../oracle_common/common/bin/wlst.sh"
 wlst_loc2="${MW_HOME}/oracle_common/common/bin/wlst.sh"
 [ -f "$wlst_loc2" ]   && wlst_sh="$wlst_loc2"
 [ -f "$wlst_loc1" ]   && wlst_sh="$wlst_loc1"
-[ -z "$wlst_sh" ] && trace SEVERE "'${wlst_loc1}' or '${wlst_loc2}' not found, make sure WL_HOME or MW_HOME is set correctly." && exit 1
+[ -z "$wlst_sh" ] && trace SEVERE "'${wlst_loc1}' or '${wlst_loc2}' not found, make sure ORACLE_HOME, WL_HOME, or MW_HOME is set correctly." && exit 1
 
 trace "Running wlst script '${wlst_script}'"