oraswdb_manage_patches: bugfix for wrong stage directory when oracle_sw_copy=true

Author: Rendanic

changelogs/fragments/oraswdb_manage_patches.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - "oraswdb_manage_patches: bugfix for wrong stage directory when oracle_sw_copy=true ()"

extensions/molecule/dbfs/side_effect.yml

@@ -4,6 +4,8 @@
   ansible.builtin.import_playbook: opitzconsulting.ansible_oracle.opatch
   vars:
     is_sw_source_local: true
+    oracle_sw_copy: true
+    oracle_sw_unpack: true
     db_homes_installed:
       - home: db19-si-ee
         state: present

roles/oraswdb_manage_patches/tasks/loop_opatch_apply.yml

@@ -3,7 +3,7 @@
 # See main.yml for loop decriptions
 #
 
-- name: State data for loop_opatch_apply.yml
+- name: loop_opatch_apply | State data for loop_opatch_apply.yml
   ansible.builtin.debug:
     msg:
       - >-
@@ -17,7 +17,7 @@
           creates: {{ __sw_patches_filename_creates }}
           patch_unarchive_dir: {{ __patch_unarchive_dir }}
 
-- name: Become User to oracle
+- name: loop_opatch_apply | Become User to oracle
   become: true
   become_user: "{{ oracle_user }}"
   block:
@@ -27,14 +27,14 @@
         - dhc_opatch.state == 'present'
       block:
 
-        - name: db_opatch | Check for unarchived patch archive
+        - name: loop_opatch_apply | Check for unarchived patch archive
           ansible.builtin.stat:
             path: "{{ __patch_unarchive_dir }}/{{ __sw_patches_filename_creates }}"
           register: checkpatcharchiveres
           vars:
             __sw_patches_filename_creates: "{{ osp_loop.creates | default((dhc_opatch.patchid | string) + '/README.txt') }}"
 
-        - name: db_opatch | Copy oracle DB patch (opatch) to server (local)
+        - name: loop_opatch_apply | Copy oracle DB patch (opatch) to server (local)
           ansible.builtin.copy:
             src: "{{ oracle_sw_source_local }}/{{ osp_loop.filename }}"
             dest: "{{ oracle_stage }}/{{ osp_loop.filename }}"
@@ -44,7 +44,7 @@
             - is_sw_source_local | bool
             - not checkpatcharchiveres.stat.exists
 
-        - name: db_opatch | Copy oracle DB patch (opatch) to server (www)
+        - name: loop_opatch_apply | Copy oracle DB patch (opatch) to server (www)
           ansible.builtin.get_url:
             url: "{{ oracle_sw_source_www }}/{{ osp_loop.filename }}"
             dest: "{{ oracle_stage }}/{{ osp_loop.filename }}"
@@ -54,28 +54,28 @@
             - not is_sw_source_local | bool
             - not checkpatcharchiveres.stat.exists | bool
 
-    - name: db_opatch | Extract one-off patch files to patch base
+    - name: loop_opatch_apply | Extract one-off patch files to patch base
       when:
         - oracle_sw_copy | bool
         - oracle_sw_unpack | bool
         - dhc_opatch.state == 'present'
       tags:
         - oraswdbpsuunpack1
       block:
-        - name: db_opatch | Create destination folder for unarchive
+        - name: loop_opatch_apply | Create destination folder for unarchive
           ansible.builtin.file:
             dest: "{{ __patch_unarchive_dir }}"
             mode: 0755
             state: directory
 
-        - name: db_opatch | Extract one-off patch files to patch base
+        - name: loop_opatch_apply | Extract one-off patch files to patch base
           ansible.builtin.unarchive:
             src: "{{ oracle_stage }}/{{ osp_loop.filename }}"
             dest: "{{ __patch_unarchive_dir }}"
             creates: "{{ __patch_unarchive_dir }}/{{ __sw_patches_filename_creates }}"
             copy: false
 
-        - name: db_opatch | Remove patch archive from stage
+        - name: loop_opatch_apply | Remove patch archive from stage
           ansible.builtin.file:
             path: "{{ oracle_stage }}/{{ osp_loop.filename }}"
             state: absent

roles/oraswdb_manage_patches/tasks/loop_patchid.yml

@@ -1,5 +1,5 @@
 ---
-- name: Work on Patch {{ dhc_opatch.patchid }}
+- name: loop_Patchid | Work on Patch {{ dhc_opatch.patchid }}
   ansible.builtin.debug:
     msg:
       - >-
@@ -14,16 +14,26 @@
           opatchauto: {{ __opatchauto_patchtype }}
       - >-
           excludeUPI: {{ dhc_opatch.excludeUPI | default('') }}
-          patchsubdir: {{ __oraswdb_manage_patches_patchsubdir | default('') }}
+      - >-
+          oracle_patch_stage: {{ oracle_patch_stage }}
+          oracle_sw_copy: {{ oracle_sw_copy | bool }}
+          is_sw_source_local: {{ is_sw_source_local | bool }}
+
+# - name: loop_Patchid | debug data
+#   ansible.builtin.debug:
+#     msg:
+#       - "{{ oracle_sw_patches | selectattr('patchid', 'equalto', dhc_opatch.patchid) }}"
+#       - "{{ dhc_opatch.patchid }}"
 
-- name: Work on oracle_sw_patches
+- name: loop_Patchid | Work on oracle_sw_patches
   ansible.builtin.include_tasks: loop_opatch_apply.yml
   vars:
     __sw_patches_filename_creates: "{{ osp_loop.creates | default((dhc_opatch.patchid | string) + '/README.txt') }}"
     __patch_unarchive_dir: "{{ oracle_patch_stage }}/{{ db_version }}/{{ __patch_upisubdir }}/"
     __patch_upisubdir: >-
-      {%- if osp_loop.unique_patchid is defined -%}
-      upi_{{ osp_loop.unique_patchid -}}/{% endif -%}
+      {{ osp_loop.unique_patchid is defined
+          | ternary(osp_loop.unique_patchid,
+                    osp_loop.patchid) }}/
   with_items:
     - "{{ oracle_sw_patches | selectattr('patchid', 'equalto', dhc_opatch.patchid) }}"
   loop_control:
@@ -38,16 +48,16 @@
     - not dbhome_patches.stdout_lines | select('match', osp_loop.patchid | string) | length > 0
     - osp_loop.unique_patchid | default(0) == dhc_opatch.excludeUPI | default(0)
 
-- name: Info
+- name: loop_Patchid | Info
   ansible.builtin.debug:
     msg: Starting opatch apply. This could take some time to complete...
 
 # opatchauto needs root user for execution
-- name: Manage patch for DB
+- name: loop_Patchid | Manage patch for DB
   opitzconsulting.ansible_oracle.oracle_opatch:
     oracle_home: "{{ oracle_home_db }}"
     patch_base: >-
-      {{ oracle_patch_install }}/{{ db_version }}/{{ dhc_opatch.path | default(__patch_upisubdir + (dhc_opatch.patchid | string)) }}
+      {{ oracle_patch_install }}/{{ db_version }}/{{ dhc_opatch.path | default(__patch_localsubdir) }}
     patch_id: "{{ dhc_opatch.patchid }}"
     patch_version: "{{ dhc_opatch.patchversion | default(omit) }}"
     exclude_upi: "{{ dhc_opatch.excludeUPI | default(omit) }}"
@@ -60,6 +70,5 @@
   become: true
   become_user: "{{ __opatchauto_patchtype | ternary('root', oracle_user) }}"
   vars:
-    __patch_upisubdir: >-
-      {%- if dhc_opatch.excludeUPI is defined -%}
-      upi_{{ dhc_opatch.excludeUPI -}}/{% endif -%}
+    __patch_localsubdir: >-
+      {{ dhc_opatch.excludeUPI | default(dhc_opatch.patchid) }}/{{ dhc_opatch.patchid | string }}