Skip to content

Commit 660eaf8

Browse files
committed
oradb_manage_-roles: check state from oracledb_facts during execution
1 parent 5fae749 commit 660eaf8

File tree

11 files changed

+98
-16
lines changed

11 files changed

+98
-16
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
minor_changes:
3+
- "oradb_manage_grants: check state from oracledb_facts during execution (oravirt#417)"
4+
- "oradb_manage_parameters: check state from oracledb_facts during execution (oravirt#417)"
5+
- "oradb_manage_pdb: check state from oracledb_facts during execution (oravirt#417)"
6+
- "oradb_manage_profiles: check state from oracledb_facts during execution (oravirt#417)"
7+
- "oradb_manage_redo: check state from oracledb_facts during execution (oravirt#417)"
8+
- "oradb_manage_roles: check state from oracledb_facts during execution (oravirt#417)"
9+
- "oradb_manage_services: check state from oracledb_facts during execution (oravirt#417)"
10+
- "oradb_manage_statspack: check state from oracledb_facts during execution (oravirt#417)"
11+
- "oradb_manage_tablespace: check state from oracledb_facts during execution (oravirt#417)"
12+
- "oradb_manage_users: check state from oracledb_facts during execution (oravirt#417)"

roles/oradb_manage_grants/tasks/main.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,20 @@
2323
when:
2424
- oracle_databases is defined
2525
- odb.0.state == 'present'
26+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
2627
- (odb.1.grants is defined or odb.1.object_privs is defined)
2728
run_once: "{{ _oraswgi_meta_configure_cluster }}"
2829
become: true
2930
become_user: "{{ oracle_user }}"
3031
loop_control:
3132
loop_var: odb
3233
label: >-
34+
db_name: {{ odb.0.oracle_db_name | default('') }}
3335
service: {{ _db_service_name }}:{{ _listener_port_cdb }}
3436
role: {{ odb.1.name | default('') }}
3537
grants: {{ odb.1.grants | default('') }}
3638
state: {{ odb.1.state | default('') }}
39+
db_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
3740
tags:
3841
- users
3942
- grants
@@ -62,6 +65,7 @@
6265
- oracle_pdbs is defined
6366
- opdb.0 is defined
6467
- opdb.0.state == 'present'
68+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
6569
- (opdb.1.grants is defined or opdb.1.object_privs is defined)
6670
- >-
6771
oracle_databases | selectattr('oracle_db_name', 'equalto', opdb.0.cdb)
@@ -72,11 +76,13 @@
7276
loop_control:
7377
loop_var: opdb
7478
label: >-
79+
cdb: {{ opdb.0.cdb | default('') }}
7580
port: {{ _listener_port_pdb }},
7681
pdb: {{ opdb.0.pdb_name }},
7782
role: {{ opdb.1.name | default('none') }},
7883
grants: {{ opdb.1.grants | default(omit) }},
7984
state: {{ opdb.1.state }}
85+
cdb_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
8086
tags:
8187
- users
8288
- grants2
@@ -106,17 +112,20 @@
106112
when:
107113
- oracle_databases is defined
108114
- odb.0.state == 'present'
115+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
109116
- (odb.1.grants is defined or odb.1.object_privs is defined)
110117
run_once: "{{ _oraswgi_meta_configure_cluster }}"
111118
become: true
112119
become_user: "{{ oracle_user }}"
113120
loop_control:
114121
loop_var: odb
115122
label: >-
123+
db_name: {{ odb.0.oracle_db_name | default('') }}
116124
service: {{ _db_service_name }}:{{ _listener_port_cdb }}
117125
schema: {{ odb.1.schema | default('') }}
118126
grants: {{ odb.1.grants | default('') }}
119127
state: {{ odb.1.state | default('') }}"
128+
db_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
120129
tags:
121130
- users
122131
- grants
@@ -145,6 +154,7 @@
145154
- oracle_pdbs is defined
146155
- opdb.0 is defined
147156
- opdb.0.state == 'present'
157+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
148158
- (opdb.1.grants is defined or opdb.1.object_privs is defined)
149159
- >-
150160
oracle_databases | selectattr('oracle_db_name', 'equalto', opdb.0.cdb)
@@ -155,11 +165,13 @@
155165
loop_control:
156166
loop_var: opdb
157167
label: >-
168+
cdb: {{ opdb.0.cdb | default('') }}
158169
port: {{ _listener_port_pdb }},
159170
pdb: {{ opdb.0.pdb_name }},
160171
schema: {{ opdb.1.schema | default('none') }},
161172
grants: {{ opdb.1.grants | default(omit) }},
162173
state: {{ opdb.1.state }}
174+
cdb_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
163175
tags:
164176
- users
165177
- grants4

roles/oradb_manage_parameters/tasks/main.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,21 @@
2323
when:
2424
- oracle_databases is defined
2525
- odb.0.state == 'present'
26+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
2627
- odb.1 is defined
2728
become: true
2829
become_user: "{{ oracle_user }}"
2930
loop_control:
3031
loop_var: odb
3132
label: >-
33+
db_name: {{ odb.0.oracle_db_name | default('') }}
3234
port: {{ _listener_port_cdb }}
3335
service: {{ _db_service_name }}
3436
name: {{ odb.1.name }}
3537
value: {{ odb.1.value }}
3638
scope: {{ odb.1.scope | default ('both') }}
3739
state:{{ odb.1.state }}
40+
db_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
3841
register: param_change_cdb
3942
tags:
4043
- initparams
@@ -63,6 +66,7 @@
6366
when:
6467
- oracle_pdbs is defined
6568
- opdb.0.state == 'present'
69+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
6670
- opdb.1 is defined
6771
- >-
6872
oracle_databases | selectattr('oracle_db_name', 'equalto', opdb.0.cdb)
@@ -72,12 +76,14 @@
7276
loop_control:
7377
loop_var: opdb
7478
label: >-
79+
cdb: {{ opdb.0.cdb | default('') }}
7580
port: {{ _listener_port_pdb }}
7681
service: {{ opdb.0.pdb_name }}
7782
name: {{ opdb.1.name }}
7883
value: {{ opdb.1.value }}
7984
scope: {{ opdb.1.scope | default ('both') }}
8085
state:{{ opdb.1.state }}"
86+
cdb_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
8187
register: param_change_pdb
8288
tags:
8389
- initparams
@@ -99,12 +105,14 @@
99105
- "" # dummy to force odb.0 instead of item.
100106
when:
101107
- odb.0.restart_spparameter_changed | default(true)
108+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
102109
- restart_spparameter_changed
103110
loop_control:
104111
loop_var: odb
105112
label: >-
106-
dbname: {{ odb.0.oracle_db_name | d('') }}
107-
- {{ param_change_reboot.msg | default('restart_spparameter_changed is false') }}"
113+
db_name: {{ odb.0.oracle_db_name | d('') }}
114+
db_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
115+
parameter: {{ param_change_reboot.msg | default('restart_spparameter_changed is false') }}"
108116
become: true
109117
become_user: "{{ oracle_user }}"
110118
register: param_change_reboot

roles/oradb_manage_pdb/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
CDB: {{ odb[1].cdb | default('') }},
3737
PDB: {{ odb[1].pdb_name | default('') }},
3838
state: {{ odb[1].state | default('') }}
39+
db_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
3940
loop_var: odb
4041
when:
4142
- oracle_databases is defined
@@ -45,3 +46,4 @@
4546
- odb[0].state|upper == 'PRESENT'
4647
- odb[1].cdb == odb[0].oracle_db_name
4748
- odb[0].is_container
49+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'

roles/oradb_manage_profiles/tasks/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@
3030
loop_control:
3131
loop_var: odb
3232
label: >-
33+
db_name: {{ odb.0.oracle_db_name | default('') }}
3334
service: {{ _db_service_name }}:{{ _listener_port_cdb }}
3435
db_name: {{ odb.0.oracle_db_name }}
3536
Profile: {{ odb.1.name }}
3637
attributes: {{ odb.1.attributes }}
38+
db_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
3739
when:
3840
- oracle_databases is defined
3941
- odb.0.state == 'present'
42+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
4043
- odb.1 is defined
4144
run_once: "{{ _oraswgi_meta_configure_cluster }}"
4245
become: true
@@ -83,10 +86,12 @@
8386
PDB: {{ opdb.0.pdb_name }}
8487
Profile: {{ opdb.1.name }}
8588
attributes: {{ opdb.1.attributes }}
89+
cdb_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
8690
when:
8791
- oracle_pdbs is defined
8892
- opdb.0 is defined
8993
- opdb.0.state == 'present'
94+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
9095
- opdb.1 is defined
9196
- >-
9297
oracle_databases | selectattr('oracle_db_name', 'equalto', opdb.0.cdb)

roles/oradb_manage_redo/tasks/main.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,14 @@
2727
- odb.redolog_size is defined
2828
- odb.redolog_groups is defined
2929
- odb.state == 'present'
30+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
3031
become_user: "{{ oracle_user }}"
3132
become: true
3233
loop_control:
3334
loop_var: odb
3435
label: >-
36+
db_name: {{ odb.oracle_db_name | default('') }}
3537
service: {{ _db_service_name }}:{{ _listener_port_cdb }}
36-
groups: {{ odb.redolog_groups | default('') }}
37-
size: {{ odb.redolog_size | default('') }}
38+
groups: {{ odb.redolog_groups }}
39+
size: {{ odb.redolog_size }}
40+
db_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}

roles/oradb_manage_roles/tasks/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@
1919
when:
2020
- oracle_databases is defined
2121
- odb.0.state == 'present'
22+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
2223
- odb.1 is defined
2324
loop_control:
2425
loop_var: odb
2526
label: >-
27+
db_name: {{ odb.0.oracle_db_name | default('') }}
2628
port {{ _listener_port_cdb }}
2729
service {{ _db_service_name }}
2830
role {{ odb.1.name }}
2931
state {{ odb.1.state }}
32+
db_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
3033
run_once: "{{ _oraswgi_meta_configure_cluster }}"
3134
become: true
3235
become_user: "{{ oracle_user }}"
@@ -52,17 +55,20 @@
5255
- oracle_pdbs is defined
5356
- opdb.0 is defined
5457
- opdb.0.state == 'present'
58+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
5559
- opdb.1 is defined
5660
- >-
5761
oracle_databases | selectattr('oracle_db_name', 'equalto', opdb.0.cdb)
5862
| map(attribute='state') | list | first == 'present'
5963
loop_control:
6064
loop_var: opdb
6165
label: >-
66+
cdb: {{ opdb.0.cdb | default('') }}
6267
port: {{ _listener_port_pdb }},
6368
service: {{ _db_service_pdb }},
6469
role: {{ opdb.1.name }},
6570
state: {{ opdb.1.state }}
71+
cdb_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
6672
run_once: "{{ _oraswgi_meta_configure_cluster }}"
6773
become: true
6874
become_user: "{{ oracle_user }}"

roles/oradb_manage_services/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
label: >-
2828
database_name {{ odb.0.oracle_db_name | default('') }}
2929
name {{ odb.1.name | default('') }}
30+
db_state: {{ oracledb_facts[_oracle_db_unique_name]['state'] | default('') }}
3031
when:
3132
- oracle_databases is defined
3233
- odb.0.state == 'present'
34+
- oracledb_facts[_oracle_db_unique_name]['state'] | default('') == 'present'
3335
- odb.1 is defined
3436
- (odb.1.state == 'present' or odb.1.state == 'started')
3537
become: true

0 commit comments

Comments
 (0)