Skip to content

Commit e706233

Browse files
committed
oradb_manage_db: more asserts + molecule
1 parent b2320d3 commit e706233

File tree

4 files changed

+39
-12
lines changed

4 files changed

+39
-12
lines changed

roles/oradb_manage_db/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,16 @@ oracle_gi_cluster_type: STANDARD
7979
8080
**_dbcatemplate_**
8181
82-
**_dbh_assert_**
83-
8482
**_listener_**
8583
8684
**_listener2_**
8785
8886
**_listener_install_**
8987
88+
**_molecule-idempotence-notest_**
89+
90+
**_odb_assert_**
91+
9092
**_psout_**
9193
9294
**_remove_db,dbca_**

roles/oradb_manage_db/tasks/assert.yml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,33 @@
44
ansible.builtin.assert:
55
quiet: true
66
that:
7-
- dbh.oracle_db_name is defined
8-
- dbh.home in db_homes_config
9-
- dbh.storage_type is defined
10-
- db_version != ""
11-
- dbh.oracle_db_type is defined
7+
- odb.oracle_db_name is defined
8+
- odb.home in db_homes_config
9+
- odb.state is defined
10+
- odb.storage_type is defined
11+
- odb.oracle_db_type is defined
1212
with_items: "{{ oracle_databases }}"
1313
register: assert1
1414
loop_control:
15-
loop_var: dbh
16-
label: "{{ dbh.oracle_db_name | default('') }}"
17-
tags: dbh_assert
15+
loop_var: odb
16+
label: "{{ odb.oracle_db_name | default('') }}"
17+
tags: odb_assert
18+
19+
# a configured listener_namein oracle_databases
20+
# needs a configured listener in inventory!
21+
- name: assert oracle_databases listener configuration
22+
ansible.builtin.assert:
23+
quiet: true
24+
fail_msg: "Missing element with listener_name in listener_installed!"
25+
that:
26+
- listener_installed | default([])
27+
| selectattr('listener_name', 'match', odb.listener_name)
28+
| list | length == 1
29+
with_items: "{{ oracle_databases | selectattr('listener_name', 'defined') }}"
30+
register: assert2
31+
loop_control:
32+
loop_var: odb
33+
label: >-
34+
oracle_db_name: {{ odb.oracle_db_name | default('') }}
35+
listener_name: {{ odb.listener_name | default('') }}
36+
tags: odb_assert

roles/oradb_manage_db/tasks/listener_details.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@
2424
# noqa no-changed-when
2525
environment: "{{ oracle_env_lsnrctl }}"
2626
become_user: "{{ oracle_user }}"
27-
tags: listener2
27+
tags:
28+
- listener2
29+
- molecule-idempotence-notest
2830

2931
- name: listener | Reload Listener
3032
ansible.builtin.shell: "export PATH=${ORACLE_HOME}/bin:${PATH}; lsnrctl reload {{ lsnrinst.listener_name }}"
3133
# noqa no-changed-when
3234
environment: "{{ oracle_env_lsnrctl }}"
3335
become_user: "{{ oracle_user }}"
34-
tags: listener2
36+
tags:
37+
- listener2
38+
- molecule-idempotence-notest

roles/oradb_manage_db/tasks/manage-db.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
ansible.builtin.debug:
8888
msg: "Executing ansible_oracle.oracle_db. This takes some time..."
8989
when: odb.state == 'present'
90+
tags: molecule-idempotence-notest
9091

9192
- name: manage_db | create/manage database
9293
opitzconsulting.ansible_oracle.oracle_db:
@@ -104,6 +105,7 @@
104105
output: verbose
105106
state: "{{ odb.state }}"
106107
run_once: "{{ _oraswgi_meta_configure_cluster }}"
108+
become: true
107109
become_user: "{{ oracle_user }}"
108110
when: odb.state == 'present'
109111
register: dbca_create

0 commit comments

Comments
 (0)