Fixing the way we locate and require Oracle home

Author: gorjant-pythian

cleanup-oracle.sh

@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Set calling script name for validation tasks
+export CALLING_SCRIPT="cleanup-oracle.sh"
+
 echo Command used:
 echo "$0 $@"
 echo

roles/common/tasks/validate-oracle-home.yml

@@ -175,7 +175,7 @@
       The --ora-db-home-dir parameter must point to a valid Oracle Database home with a functioning Oracle binary.
       This should be the path to the Oracle Database software installation, not the Grid Infrastructure home.
   when:
-    - calling_script != "install-oracle.sh"
+    - calling_script == "add-database.sh"
     - oracle_binary.stat is defined
     - not oracle_binary.stat.exists | default(false) | bool
     - oracle_binary_alt is not defined or not oracle_binary_alt.stat.exists | default(false) | bool