Skip to content

Commit 02fcb0f

Browse files
committed
Bugfix for state=absent in oracle_databases with CDB
1 parent e8d53b4 commit 02fcb0f

File tree

8 files changed

+31
-0
lines changed

8 files changed

+31
-0
lines changed

changelogs/fragments/manage_db.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
---
22
bugfixes:
33
- "oradb_manage_db: Regather oradb_facts after database change ()"
4+
- "Bugfix for state=absent in oracle_databases with CDB ()"

roles/oradb_manage_grants/tasks/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
- opdb.0 is defined
6464
- opdb.0.state == 'present'
6565
- (opdb.1.grants is defined or opdb.1.object_privs is defined)
66+
- >-
67+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
68+
| map(attribute='state') | list | first == 'present'
6669
run_once: "{{ _oraswgi_meta_configure_cluster }}"
6770
become: true
6871
become_user: "{{ oracle_user }}"
@@ -143,6 +146,9 @@
143146
- opdb.0 is defined
144147
- opdb.0.state == 'present'
145148
- (opdb.1.grants is defined or opdb.1.object_privs is defined)
149+
- >-
150+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
151+
| map(attribute='state') | list | first == 'present'
146152
run_once: "{{ _oraswgi_meta_configure_cluster }}"
147153
become: true
148154
become_user: "{{ oracle_user }}"

roles/oradb_manage_parameters/tasks/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@
6464
- oracle_pdbs is defined
6565
- opdb.0.state == 'present'
6666
- opdb.1 is defined
67+
- >-
68+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
69+
| map(attribute='state') | list | first == 'present'
6770
become: true
6871
become_user: "{{ oracle_user }}"
6972
loop_control:

roles/oradb_manage_profiles/tasks/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@
8888
- opdb.0 is defined
8989
- opdb.0.state == 'present'
9090
- opdb.1 is defined
91+
- >-
92+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
93+
| map(attribute='state') | list | first == 'present'
9194
run_once: "{{ _oraswgi_meta_configure_cluster }}"
9295
become: true
9396
become_user: "{{ oracle_user }}"

roles/oradb_manage_roles/tasks/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
- opdb.0 is defined
5454
- opdb.0.state == 'present'
5555
- opdb.1 is defined
56+
- >-
57+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
58+
| map(attribute='state') | list | first == 'present'
5659
loop_control:
5760
loop_var: opdb
5861
label: >-

roles/oradb_manage_statspack/tasks/main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,9 @@
262262
- opdb.0.state == 'present'
263263
- opdb.0.statspack is defined
264264
- opdb.0.statspack.state == 'present'
265+
- >-
266+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
267+
| map(attribute='state') | list | first == 'present'
265268
266269
- name: Output
267270
ansible.builtin.debug:
@@ -305,6 +308,9 @@
305308
- opdb.0.state == 'present'
306309
- opdb.0.statspack is defined
307310
- opdb.0.statspack.state == 'present'
311+
- >-
312+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
313+
| map(attribute='state') | list | first == 'present'
308314
become: true
309315
become_user: "{{ oracle_user }}"
310316
tags:
@@ -341,6 +347,9 @@
341347
- opdb.0.state == 'present'
342348
- opdb.0.statspack is defined
343349
- opdb.0.statspack.state == 'present'
350+
- >-
351+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
352+
| map(attribute='state') | list | first == 'present'
344353
become: true
345354
become_user: "{{ oracle_user }}"
346355
tags:

roles/oradb_manage_tablespace/tasks/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
- oracle_pdbs is defined
7676
- opdb.1 is defined
7777
- opdb.0.state == 'present'
78+
- >-
79+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
80+
| map(attribute='state') | list | first == 'present'
7881
loop_control:
7982
loop_var: opdb
8083
label: >-

roles/oradb_manage_users/tasks/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
- opdb.1 is defined
7474
- opdb.1.schema is defined
7575
- opdb.1.state is defined
76+
- >-
77+
oracle_databases | selectattr('oracle_db_name', 'match', opdb.0.cdb)
78+
| map(attribute='state') | list | first == 'present'
7679
run_once: "{{ _oraswgi_meta_configure_cluster }}"
7780
become: true
7881
become_user: "{{ oracle_user }}"

0 commit comments

Comments
 (0)