Merge pull request #187 from pythian/rel/oratk-30

Cleanup process enhancement: improved if-statement to instead check on `role_separation`

cleanup-oracle.sh

@@ -127,9 +127,11 @@ done
 
 shopt -s nocasematch
 
-# Oracle Database free edition parameter overrides
-if [[ "${ORA_EDITION}" = "FREE" && ! "${ORA_VERSION}" =~ ^23\. ]]; then
-    ORA_VERSION="23.0.0.0.0"
+# Parameter defaults and changes required for Free Edition
+# (including unsupported features such as role_separation)
+if [[ "${ORA_EDITION}" = "FREE" ]]; then
+    ORA_ROLE_SEPARATION=FALSE
+    [[ ! "${ORA_VERSION}" =~ ^23\. ]] && ORA_VERSION="23.0.0.0.0"
 fi
 
 # Mandatory options

roles/brute-ora-cleanup/tasks/main.yml

@@ -201,7 +201,7 @@
     - /grid/bin
     - /grid/jdk
     - "-u {{ oracle_user }}"
-    - "{% if free_edition %}[]{% else %}-u {{ grid_user }}{% endif %}"
+    - "{% if role_separation | bool %}-u {{ grid_user }}{% else %}[]{% endif %}"
   ignore_errors: true
   register: kill_procs
   changed_when: kill_procs.rc == 0
@@ -229,7 +229,7 @@
     - /grid/bin
     - /grid/jdk
     - "-u {{ oracle_user }}"
-    - "{% if free_edition %}[]{% else %}-u {{ grid_user }}{% endif %}"
+    - "{% if role_separation | bool %}-u {{ grid_user }}{% else %}[]{% endif %}"
   ignore_errors: true
   register: kill_procs
   changed_when: kill_procs.rc == 0