Skip to content

Commit c9acb8f

Browse files
committed
oradb_manage_db: improved listener reload/start + molecule tags
1 parent fe6c783 commit c9acb8f

File tree

3 files changed

+32
-20
lines changed

3 files changed

+32
-20
lines changed

roles/oradb_manage_db/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ oracle_gi_cluster_type: STANDARD
6767
6868
**_create_cdb,dotprofile_db_**
6969
70-
**_create_db,dbca,customdbcatemplate,dotprofile_db,listener2_**
70+
**_create_db_**
7171
72-
**_create_db,dbcatemplate_**
72+
**_create_db,dbca,customdbcatemplate,dotprofile_db,listener2_**
7373
7474
**_create_db,dotprofile_db_**
7575
76-
**_create_db,manage_db,dbca_**
77-
7876
**_customdbcatemplate_**
7977
78+
**_dbca_**
79+
8080
**_dbcatemplate_**
8181
8282
**_listener_**
@@ -85,6 +85,8 @@ oracle_gi_cluster_type: STANDARD
8585
8686
**_listener_install_**
8787
88+
**_manage_db_**
89+
8890
**_molecule-idempotence-notest_**
8991
9092
**_odb_assert_**
Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
- ansible.builtin.debug: # noqa name[missing]
2+
- name: ORACLE_BASE_HOME
3+
ansible.builtin.debug:
34
msg: "ORACLE_BASE_HOME {{ _oradb_manage_db_listener_home_config }}"
45
tags: listener2
56

@@ -19,20 +20,23 @@
1920

2021
# Don't try to stop the listener at this point
2122
# => Restart of role will fail at create/manage database due to TNS-12514
22-
- name: listener | Start Listener - ignore errors for running Listener
23-
ansible.builtin.shell: "export PATH=${ORACLE_HOME}/bin:${PATH}; lsnrctl start {{ lsnrinst.listener_name }} /dev/null; exit 0"
24-
# noqa no-changed-when
25-
environment: "{{ oracle_env_lsnrctl }}"
26-
become_user: "{{ oracle_user }}"
27-
tags:
28-
- listener2
29-
- molecule-idempotence-notest
23+
- name: listener | Start/Reload Listener # noqa no-changed-when
24+
ansible.builtin.shell: |
25+
#!/usr/bin/env bash
26+
set -eu
27+
set -o pipefail
28+
LSNRCTL="${ORACLE_HOME}/bin/lsnrctl"
3029
31-
- name: listener | Reload Listener
32-
ansible.builtin.shell: "export PATH=${ORACLE_HOME}/bin:${PATH}; lsnrctl reload {{ lsnrinst.listener_name }}"
33-
# noqa no-changed-when
30+
if "${LSNRCTL}" status {{ lsnrinst.listener_name }} 2>/dev/null ; then
31+
# Reload running listener
32+
"${LSNRCTL}" reload {{ lsnrinst.listener_name }} > /dev/null
33+
else
34+
# Start listener
35+
"${LSNRCTL}" start {{ lsnrinst.listener_name }} > /dev/null
36+
fi
3437
environment: "{{ oracle_env_lsnrctl }}"
3538
become_user: "{{ oracle_user }}"
39+
become: true
3640
tags:
37-
- listener2
3841
- molecule-idempotence-notest
42+
- listener2

roles/oradb_manage_db/tasks/manage-db.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,16 @@
8080
dbh: "{{ odb }}"
8181
run_once: "{{ _oraswgi_meta_configure_cluster }}"
8282
when: odb.state == 'present'
83-
tags: create_db,dbcatemplate
83+
tags:
84+
- create_db
85+
- dbcatemplate
86+
- molecule-idempotence-notest
8487

8588
# show debug task for environments with display_skipped_hosts = false
8689
- name: manage_db | Start create/manage database
8790
ansible.builtin.debug:
8891
msg: "Executing ansible_oracle.oracle_db. This takes some time..."
8992
when: odb.state == 'present'
90-
tags: molecule-idempotence-notest
9193

9294
- name: manage_db | create/manage database
9395
opitzconsulting.ansible_oracle.oracle_db:
@@ -109,7 +111,11 @@
109111
become_user: "{{ oracle_user }}"
110112
when: odb.state == 'present'
111113
register: dbca_create
112-
tags: create_db,manage_db,dbca
114+
tags:
115+
- molecule-idempotence-notest
116+
- create_db
117+
- manage_db
118+
- dbca
113119

114120
- name: manage_db | Customize oratab for autostart
115121
ansible.builtin.lineinfile:

0 commit comments

Comments
 (0)