Skip to content

Commit 45b185f

Browse files
Thilo SolbrigRendanic
authored andcommitted
Enable cvuqdisk install on FIPS systems
1 parent 8a179a4 commit 45b185f

File tree

8 files changed

+32
-28
lines changed

8 files changed

+32
-28
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
bugfixes:
3+
- "oraswgi_install: ansible.builtin.yum fails installing cvuqdisk on FIPS-enabled hosts due to missing package digest"

roles/oraswgi_install/tasks/12.1.0.1.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,8 @@
2525
when: oracle_home_gi not in checkgiinstall.stdout and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
2626

2727
- name: install_home_gi | Install cvuqdisk rpm
28-
# noqa ignore-errors
29-
ansible.builtin.yum: # noqa fqcn[action-core]
30-
name: "{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}"
31-
state: present
32-
when: _oraswgi_meta_configure_cluster
28+
ansible.builtin.include_tasks: "install_cvuqdisk.yml"
3329
tags: cvuqdisk
34-
ignore_errors: true
3530

3631
- name: install_home_gi | Setup response file for install (GI)
3732
ansible.builtin.template:

roles/oraswgi_install/tasks/12.1.0.2.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,8 @@
2727
when: oracle_home_gi not in checkgiinstall.stdout and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
2828

2929
- name: install_home_gi | Install cvuqdisk rpm
30-
ansible.builtin.yum: # noqa fqcn[action-core]
31-
name: "{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}"
32-
state: present
33-
# noqa ignore-errors
34-
when: _oraswgi_meta_configure_cluster
30+
ansible.builtin.include_tasks: "install_cvuqdisk.yml"
3531
tags: cvuqdisk
36-
ignore_errors: true
3732

3833
- name: install_home_gi | Setup response file for install (GI)
3934
ansible.builtin.template:

roles/oraswgi_install/tasks/12.2.0.1.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,8 @@
4949
- _orasw_meta_primary_node | bool
5050

5151
- name: install_home_gi | Install cvuqdisk rpm
52-
ansible.builtin.yum: # noqa fqcn[action-core]
53-
name: "{{ oracle_home_gi }}/cv/rpm/{{ cvuqdisk_rpm }}"
54-
state: present
55-
# noqa ignore-errors
56-
when: _oraswgi_meta_configure_cluster
52+
ansible.builtin.include_tasks: "install_cvuqdisk.yml"
5753
tags: cvuqdisk
58-
ignore_errors: true
5954

6055
- name: install_home_gi | Recreate ORACLE_HOME (gi) on other nodes
6156
ansible.builtin.file:

roles/oraswgi_install/tasks/18.3.0.0.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,8 @@
5353
- _orasw_meta_primary_node | bool
5454

5555
- name: install_home_gi | Install cvuqdisk rpm
56-
ansible.builtin.yum: # noqa fqcn[action-core]
57-
name: "{{ oracle_home_gi }}/cv/rpm/{{ cvuqdisk_rpm }}"
58-
state: present
59-
# noqa ignore-errors
60-
when: _oraswgi_meta_configure_cluster
56+
ansible.builtin.include_tasks: "install_cvuqdisk.yml"
6157
tags: cvuqdisk
62-
ignore_errors: true
6358

6459
- name: install_home_gi | Recreate ORACLE_HOME (gi) on other nodes
6560
ansible.builtin.file:

roles/oraswgi_install/tasks/19.3.0.0.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,7 @@
9898
tags: cvuqdisk
9999

100100
- name: include 19c/21c | Install cvuqdisk rpm
101-
ansible.builtin.yum: # noqa fqcn[action-core]
102-
name: "{{ oracle_rsp_stage }}/{{ cvuqdisk_rpm }}"
103-
state: present
104-
disable_gpg_check: true
101+
ansible.builtin.include_tasks: "install_cvuqdisk.yml"
105102
tags: cvuqdisk
106103

107104
# @todo information: add selectattr to asm_diskgroups
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
- name: install_home_gi | Install cvuqdisk rpm
3+
# noqa ignore-errors
4+
when:
5+
- _oraswgi_meta_configure_cluster
6+
tags: cvuqdisk
7+
ignore_errors: true
8+
block:
9+
- name: install_home_gi | Install cvuqdisk rpm (non-FIPS)
10+
ansible.builtin.yum: # noqa fqcn[action-core]
11+
name: "{{ oracle_home_gi }}/cv/rpm/{{ cvuqdisk_rpm }}"
12+
state: present
13+
when:
14+
- not ansible_fips
15+
16+
- name: install_home_gi | Install cvuqdisk rpm (FIPS)
17+
# noqa command-instead-of-module
18+
ansible.builtin.command:
19+
"rpm --upgrade --nodigest --nofiledigest {{ oracle_rsp_stage }}/{{ cvuqdisk_rpm }}"
20+
register: _oraswgi_install_cvuqdisk_result
21+
changed_when: _oraswgi_install_cvuqdisk_result.rc == 0
22+
when:
23+
- ansible_fips

roles/oraswgi_install/tasks/runcluvfy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
environment: "{{ oracle_script_env }}"
6262
when:
6363
- not _oraswgi_meta_configure_cluster
64+
- not gi_ignoreprereq | bool
6465

6566
- ansible.builtin.debug: # noqa name[missing]
6667
var: cmdruncluvfy.stdout_lines

0 commit comments

Comments
 (0)