Skip to content

Commit ac8f778

Browse files
committed
oraswgi_install: use role oracluvfy for cluvfy during installation
1 parent 5f747b6 commit ac8f778

File tree

2 files changed

+22
-34
lines changed

2 files changed

+22
-34
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
minor_changes:
3+
- "oraswgi_install: use role oracluvfy for cluvfy during installation (oravirt#423)"

roles/oraswgi_install/tasks/runcluvfy.yml

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,49 +27,34 @@
2727
- ansible_distribution_major_version | int == 8
2828
- oracle_install_version_gi == "19.3.0.0"
2929

30-
- name: install_home_gi | Execute runcluvfy.sh for Grid-Infrastructure
31-
ansible.builtin.command:
32-
argv:
33-
- "{{ oracle_home_gi }}/runcluvfy.sh"
34-
- stage
35-
- -pre
36-
- crsinst
37-
- -responseFile
38-
- "{{ oracle_rsp_stage }}/{{ _oraswgi_install_oracle_grid_responsefile }}"
30+
- name: install_home_gi | Execute cluvfy for Grid-Infrastructure
31+
ansible.builtin.import_role:
32+
name: oracluvfy
33+
tasks_from: execute_cluvfy.yml
34+
vars:
35+
cluvfy_args: >-
36+
stage -pre
37+
crsinst
38+
-responseFile {{ oracle_rsp_stage }}/{{ _oraswgi_install_oracle_grid_responsefile }}
3939
register: cmdruncluvfygi
40-
failed_when: cmdruncluvfygi.rc == -1
41-
changed_when: cmdruncluvfygi.rc == 0
4240
become: true
4341
become_user: "{{ _grid_install_user }}"
4442
when:
4543
- _oraswgi_meta_configure_cluster
4644
- _orasw_meta_primary_node | bool
47-
48-
- ansible.builtin.debug: # noqa name[missing]
49-
var: cmdruncluvfygi.stdout_lines
50-
when: cmdruncluvfygi.stdout_lines is defined
51-
52-
- name: install_home_gi | runcluvfy.sh failed
53-
ansible.builtin.fail:
54-
msg: "runcluvfy.sh failed - aborting Playbook rc={{ cmdruncluvfygi.rc }}"
55-
when:
56-
- cmdruncluvfygi.rc is defined
57-
- cmdruncluvfygi.rc != 0
5845
- not gi_ignoreprereq | bool
5946

60-
- name: install_home_gi | Execute runcluvfy.sh for Oracle Restart
61-
ansible.builtin.command:
62-
argv:
63-
- "{{ oracle_home_gi }}/runcluvfy.sh"
64-
- comp
65-
- sys
66-
- -p
67-
- crs
68-
- -orainv
69-
- oinstall
47+
- name: install_home_gi | Execute cluvfy for Oracle Restart
48+
ansible.builtin.import_role:
49+
name: oracluvfy
50+
tasks_from: execute_cluvfy.yml
51+
vars:
52+
cluvfy_args: >-
53+
stage -pre hacfg
54+
-osdba {{ dba_group }}
55+
-osoper {{ oper_group }}
56+
-orainv oinstall
7057
register: cmdruncluvfy
71-
failed_when: cmdruncluvfy.rc == -1
72-
changed_when: cmdruncluvfy.rc == 0
7358
become: true
7459
become_user: "{{ _grid_install_user }}"
7560
when:

0 commit comments

Comments
 (0)