Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for presence of "patchid" directory only, instead of "patchid/R… #483

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/unarchive-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- "oraswdb_manage_patches, oraswgi_manage_patches: make unarchive check work for combo patches too (oravirt#482)"
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
- name: copy_patches_for_dbh | 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') }}"
__sw_patches_filename_creates: "{{ osp_loop.creates | default(dhc_opatch.patchid | string) }}"
__patch_unarchive_dir: "{{ oracle_patch_stage }}/{{ db_version }}/{{ __patch_upisubdir }}/"
__patch_upisubdir: >-
{{ osp_loop.unique_patchid is defined
Expand Down
2 changes: 1 addition & 1 deletion roles/oraswdb_manage_patches/tasks/loop_opatch_apply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
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') }}"
__sw_patches_filename_creates: "{{ osp_loop.creates | default(dhc_opatch.patchid | string) }}"

- name: loop_opatch_apply | Copy oracle DB patch (opatch) to server (local)
ansible.builtin.copy:
Expand Down
2 changes: 1 addition & 1 deletion roles/oraswdb_manage_patches/tasks/loop_patchid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
- 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') }}"
__sw_patches_filename_creates: "{{ osp_loop.creates | default(dhc_opatch.patchid | string) }}"
__patch_unarchive_dir: "{{ oracle_patch_stage }}/{{ db_version }}/{{ __patch_upisubdir }}/"
__patch_upisubdir: >-
{{ osp_loop.unique_patchid is defined
Expand Down
2 changes: 1 addition & 1 deletion roles/oraswgi_manage_patches/tasks/loop_patchid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- name: loop_patchid | Work on oracle_sw_patches
ansible.builtin.include_tasks: loop_stage_patch.yml
vars:
__sw_patches_filename_creates: "{{ osp_loop.creates | default((gip_opatch.0.patchid | string) + '/README.txt') }}"
__sw_patches_filename_creates: "{{ osp_loop.creates | default(gip_opatch.0.patchid | string) }}"
__patch_unarchive_dir: "{{ oracle_patch_stage }}/{{ oracle_install_version_gi }}/{{ __patch_upisubdir }}/"
__patch_upisubdir: >-
{%- if osp_loop.unique_patchid is defined -%}
Expand Down
2 changes: 1 addition & 1 deletion roles/oraswgi_manage_patches/tasks/loop_stage_patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{ _oraswgi_manage_patches_sw_patch_dict.unique_patchid | default(_oraswgi_manage_patches_sw_patch_dict.patchid) }}
_oraswgi_manage_patches_unarchive_dir: "{{ oracle_patch_stage }}/{{ _oraswgi_manage_patches_sw_patch_dict.version }}/{{ _oraswgi_manage_patches_unique_patchid }}"
_oraswgi_manage_patches_creates: >-
{{ _oraswgi_manage_patches_unarchive_dir }}/{{ _oraswgi_manage_patches_sw_patch_dict.creates | default((_oraswgi_manage_patches_sw_patch_dict.patchid | string) + '/README.txt') }}
{{ _oraswgi_manage_patches_unarchive_dir }}/{{ _oraswgi_manage_patches_sw_patch_dict.creates | default(_oraswgi_manage_patches_sw_patch_dict.patchid | string) }}

block:
- name: Loop_stage_patch | State data for loop_stage_patch.yml
Expand Down
Loading