Skip to content

Commit 84cea78

Browse files
committed
orasw_meta: changed assert for playbook manage_sqlnet.yml on RAC/Restart
1 parent 994ab51 commit 84cea78

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
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+
- "orasw_meta: changed assert for playbook manage_sqlnet.yml on RAC/Restart (oravirt#475)"

roles/orasw_meta/tasks/assert_sqlnet.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
ansible.builtin.assert:
1111
quiet: true
1212
that:
13-
- sqlni.home is defined
14-
- db_homes_config[sqlni.home] is defined
13+
- (sqlni.home is defined and not sqlni.use_gi_home | default(false))
14+
or
15+
(sqlni.home is undefined and sqlni.use_gi_home | default(false))
16+
- sqlni.use_gi_home | default(false) or (sqlni.home is defined and db_homes_config[sqlni.home] is defined)
1517
- sqlni.state is defined
1618
- sqlni.state in ['absent', 'present']
1719
- sqlni.sqlnet is defined
@@ -33,7 +35,8 @@
3335
with_items:
3436
- "{{ assertsqlnet_installed['results'] }}"
3537
loop_control:
36-
label: "{{ item['sqlni']['key'] | default('') }}"
38+
label: >-
39+
{{ item['sqlni']['sqlnet'] | default('') }}
3740
when:
3841
- assertsqlnet_installed.results is defined
3942
- item.failed is defined
@@ -49,7 +52,10 @@
4952
ansible.builtin.assert:
5053
quiet: true
5154
that:
52-
- tnsni.home is defined
55+
- (tnsni.home is defined and not tnsni.use_gi_home | default(false))
56+
or
57+
(tnsni.home is undefined and tnsni.use_gi_home | default(false))
58+
- tnsni.use_gi_home | default(false) or (tnsni.home is defined and db_homes_config[tnsni.home] is defined)
5359
- db_homes_config[tnsni.home] is defined
5460
- tnsni.state is defined
5561
- tnsni.state in ['absent', 'present']
@@ -58,7 +64,8 @@
5864
with_items:
5965
- "{{ tnsnames_installed }}"
6066
loop_control:
61-
label: "{{ tnsni.key | default('') }}"
67+
label: >-
68+
{{ tnsni.name | default('') }}
6269
loop_var: tnsni
6370
when:
6471
- tnsnames_installed is defined
@@ -72,7 +79,8 @@
7279
with_items:
7380
- "{{ asserttnsnames_installed['results'] }}"
7481
loop_control:
75-
label: "{{ item['tnsni']['key'] | default('') }}"
82+
label: >-
83+
{{ item['tnsni']['name'] | default('') }}
7684
when:
7785
- asserttnsnames_installed.results is defined
7886
- item.failed is defined
@@ -88,16 +96,19 @@
8896
ansible.builtin.assert:
8997
quiet: true
9098
that:
91-
- lsnri.home is defined
92-
- db_homes_config[lsnri.home] is defined
99+
- (lsnri.home is defined and not lsnri.use_gi_home | default(false))
100+
or
101+
(lsnri.home is undefined and lsnri.use_gi_home | default(false))
102+
- lsnri.use_gi_home | default(false) or (lsnri.home is defined and db_homes_config[lsnri.home] is defined)
93103
- lsnri.state is defined
94104
- lsnri.state in ['absent', 'present']
95105
- lsnri.listener_name is defined
96106
- oracle_listeners_config[lsnri.listener_name] is defined
97107
with_items:
98108
- "{{ listener_installed }}"
99109
loop_control:
100-
label: "{{ lsnri.key | default('') }}"
110+
label: >-
111+
{{ lsnri.listener_name | default('') }}
101112
loop_var: lsnri
102113
when:
103114
- listener_installed is defined
@@ -111,7 +122,8 @@
111122
with_items:
112123
- "{{ assertlistener_installed['results'] }}"
113124
loop_control:
114-
label: "{{ item['lsnri']['key'] | default('') }}"
125+
label: >-
126+
item={{ item['lsnri'] | default('') }}
115127
when:
116128
- assertlistener_installed.results is defined
117129
- item.failed is defined

0 commit comments

Comments
 (0)