minor fixes for role separation in Oracle Restart

changelogs/fragments/role_sparation.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - "minor fixes for role separation in Oracle Restart (oravirt#409)"

roles/oraswgi_install/tasks/19.3.0.0.yml

@@ -36,8 +36,6 @@
         - patch_before_rootsh
         - oracle_home_gi not in checkgiinstall.stdout
         - oracle_install_version_gi is version(19, '>=')
-      vars:
-        oracle_user: "{{ grid_user }}"
 
 - name: install_home_gi | Check for file GridSetup.sh
   no_log: true

roles/oraswgi_install/tasks/assert.yml

@@ -1,5 +1,5 @@
 ---
-- name: Oraswdb_install | Assert variables
+- name: Oraswgi_install | Assert variables
   ansible.builtin.assert:
     quiet: true
     that:
@@ -9,15 +9,28 @@
   tags: always
 
 # RAC is not supported at the moment!
-- name: Oraswdb_install | Assert oracle_install_option_gi
+- name: Oraswgi_install | Assert oracle_install_option_gi
   ansible.builtin.assert:
     quiet: true
     that:
       - oracle_install_option_gi in ('HA_CONFIG')
       # - oracle_install_option_gi in ('HA_CONFIG', 'CRS_CONFIG')
   tags: always
 
-- name: Oraswdb_install | Assert Grid-Infrastructure variables
+- name: Oraswgi_install | Assert role_separation
+  ansible.builtin.assert:
+    quiet: true
+    that:
+      - (role_separation and grid_user != oracle_user)
+        or
+        not role_separation
+    fail_msg: >-
+      Role separation is enabled.
+      Different values for grid_user={{ grid_user }}
+      and oracle_user={{ oracle_user }} needed.
+  tags: always
+
+- name: Oraswgi_install | Assert Grid-Infrastructure variables
   ansible.builtin.assert:
     quiet: true
     that:

roles/oraswgi_manage_patches/tasks/loop_remove_single_opatch.yml

@@ -2,7 +2,7 @@
 - name: loop_remove_single_opatch | Get unique_patch_id from installed patch
   ansible.builtin.command: "{{ oracle_home_gi }}/OPatch/opatch lspatches -oh {{ oracle_home_gi }} -id {{ gip_opatch.patchid }}"
   become: true
-  become_user: "{{ oracle_user }}"
+  become_user: "{{ _grid_install_user }}"
   changed_when: false
   register: gihome_oneoff_res
 
@@ -33,4 +33,4 @@
         output: verbose
         state: "{{ gip_opatch.state }}"
       become: true
-      become_user: "{{ oracle_user }}"
+      become_user: "{{ _grid_install_user }}"

roles/oraswgi_manage_patches/tasks/loop_stage_patch.yml

@@ -19,7 +19,7 @@
 
 - name: Loop_stage_patch | Become User to oracle
   become: true
-  become_user: "{{ oracle_user }}"
+  become_user: "{{ _grid_install_user }}"
   block:
     - name: Loop_stage_patch | Copy oracle DB patch (opatch) to server
       when:

roles/oraswgi_manage_patches/tasks/post_install_patch.yml

@@ -2,7 +2,7 @@
 - name: post_install_patch | Get list of current installed patches
   ansible.builtin.command: "{{ oracle_home_gi }}/OPatch/opatch lspatches -oh {{ oracle_home_gi }}"
   become: true
-  become_user: "{{ grid_user }}"
+  become_user: "{{ _grid_install_user }}"
   changed_when: false
   register: gihome_patches
 
@@ -116,7 +116,7 @@
 - name: post_install_patch | Get new list of current installed patches
   ansible.builtin.command: "{{ oracle_home_gi }}/OPatch/opatch lspatches -oh {{ oracle_home_gi }}"
   become: true
-  become_user: "{{ oracle_user }}"
+  become_user: "{{ _grid_install_user }}"
   changed_when: false
   register: dbhome_patches
   when:

roles/oraswgi_manage_patches/tasks/roothas_postpatch.yml

@@ -3,7 +3,7 @@
   ansible.builtin.stat:
     path: "{{ oracle_home_gi }}/bin"
   become: true
-  become_user: "{{ grid_user }}"
+  become_user: "{{ _grid_install_user }}"
   register: oraclehomegi_stat
 
 - name: roothas_postpatch | Execute roothas.sh -postpatch

roles/oraswgi_manage_patches/tasks/roothas_prepatch.yml

@@ -3,7 +3,7 @@
   ansible.builtin.stat:
     path: "{{ oracle_home_gi }}/bin"
   become: true
-  become_user: "{{ grid_user }}"
+  become_user: "{{ _grid_install_user }}"
   register: oraclehomegi_stat
 
 - name: roothas_prepatch | Execute roothas.sh -prepatch

roles/oraswgi_meta/tasks/assert.yml

@@ -26,7 +26,10 @@
 
     - name: Type of Installation
       ansible.builtin.debug:
-        msg: "oracle_install_option_gi: {{ oracle_install_option_gi }}"
+        msg:
+          - "oracle_install_option_gi: {{ oracle_install_option_gi }}"
+          - "role_separation:          {{ role_separation }}"
+          - "_grid_install_user:       {{ _grid_install_user }} (internal variable. Use grid_user + role_separation in inventory.)"
 
     - name: Assert Variables for Restart/Grid Infrastructure Setup
       ansible.builtin.assert: