From 2816fe99f9c38ddb9a51262b9552593b0da4766c Mon Sep 17 00:00:00 2001
From: Thorsten Bruhns <thorsten.bruhns@googlemail.com>
Date: Sun, 13 Aug 2023 17:55:51 +0000
Subject: [PATCH] oradb_manage_db: bugfix for wrong IFILE path in tnsnames.ora
 and sqlnet.ora when readonly ORACLE_HOME is used

---
 changelogs/fragments/ifile.yml           | 3 +++
 roles/oradb_manage_db/tasks/sqlnet.yml   | 6 +++---
 roles/oradb_manage_db/tasks/tnsnames.yml | 6 +++---
 roles/oradb_manage_db/vars/main.yml      | 8 ++++++++
 4 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/fragments/ifile.yml
 create mode 100644 roles/oradb_manage_db/vars/main.yml

diff --git a/changelogs/fragments/ifile.yml b/changelogs/fragments/ifile.yml
new file mode 100644
index 000000000..d175cab2d
--- /dev/null
+++ b/changelogs/fragments/ifile.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - "oradb_manage_db: bugfix for wrong IFILE path in tnsnames.ora and sqlnet.ora when readonly ORACLE_HOME is used (oravirt#371)"
diff --git a/roles/oradb_manage_db/tasks/sqlnet.yml b/roles/oradb_manage_db/tasks/sqlnet.yml
index 4d49f2afe..2d109390e 100644
--- a/roles/oradb_manage_db/tasks/sqlnet.yml
+++ b/roles/oradb_manage_db/tasks/sqlnet.yml
@@ -5,10 +5,10 @@
 
 - name: sqlnet.ora | create IFILE entry in sqlnet.ora
   ansible.builtin.lineinfile:
-    line: "IFILE={{ listener_home_config }}/network/admin/sqlnet_ansible.ora"
+    line: "IFILE={{ _oradb_manage_db_tns_home }}/network/admin/sqlnet_ansible.ora"
     regexp: "^IFILE=/"
     insertbefore: BOF
-    path: "{{ listener_home_config }}/network/admin/sqlnet.ora"
+    path: "{{ _oradb_manage_db_tns_home }}/network/admin/sqlnet.ora"
     backup: true
     create: true
     group: "{{ oracle_group }}"
@@ -19,7 +19,7 @@
 
 - name: sqlnet.ora | create custom configuration in sqlnet_ansible.ora
   ansible.builtin.lineinfile:
-    path: "{{ listener_home_config }}/network/admin/sqlnet_ansible.ora"
+    path: "{{ _oradb_manage_db_tns_home }}/network/admin/sqlnet_ansible.ora"
     line: "{{ item.name }}={{ item.value }}"
     regexp: "^{{ item.name }}="
     backup: true
diff --git a/roles/oradb_manage_db/tasks/tnsnames.yml b/roles/oradb_manage_db/tasks/tnsnames.yml
index bd7c91f4d..f2a30b171 100644
--- a/roles/oradb_manage_db/tasks/tnsnames.yml
+++ b/roles/oradb_manage_db/tasks/tnsnames.yml
@@ -5,10 +5,10 @@
 
 - name: tnsnames.ora | create IFILE entry in tnsnames.ora
   ansible.builtin.lineinfile:
-    line: "IFILE={{ listener_home }}/network/admin/tnsnames_ansible.ora"
+    line: "IFILE={{ _oradb_manage_db_tns_home }}/network/admin/tnsnames_ansible.ora"
     regexp: "^IFILE=/"
     insertbefore: BOF
-    path: "{{ listener_home_config }}/network/admin/tnsnames.ora"
+    path: "{{ _oradb_manage_db_tns_home }}/network/admin/tnsnames.ora"
     backup: true
     create: true
     group: "{{ oracle_group }}"
@@ -19,7 +19,7 @@
 
 - name: tnsnames.ora | create custom configuration in tnsnames_ansible.ora
   ansible.builtin.blockinfile:
-    path: "{{ listener_home_config }}/network/admin/tnsnames_ansible.ora"
+    path: "{{ _oradb_manage_db_tns_home }}/network/admin/tnsnames_ansible.ora"
     backup: true
     create: true
     group: "{{ oracle_group }}"
diff --git a/roles/oradb_manage_db/vars/main.yml b/roles/oradb_manage_db/vars/main.yml
new file mode 100644
index 000000000..8ca461cc5
--- /dev/null
+++ b/roles/oradb_manage_db/vars/main.yml
@@ -0,0 +1,8 @@
+---
+
+_oradb_manage_db_tns_loop_helper: "{{ tnsinst | default(sqlnetinst) | default({}) }}"
+
+_oradb_manage_db_tns_home: |-
+  {%- if db_homes_config[_oradb_manage_db_tns_loop_helper.home]['readonly_home'] | default(false) %}
+  {{ oracle_base }}/homes/{{ db_homes_config[_oradb_manage_db_tns_loop_helper.home]['oracle_home_name'] }}
+  {%- else %}{{ listener_home_config }}{% endif -%}