From 51ca83ad04a36596136ccc17dbe8638a42e3137d Mon Sep 17 00:00:00 2001
From: Yacine31 <yacine.oumghar@gmail.com>
Date: Tue, 2 Dec 2025 15:29:15 +0100
Subject: [PATCH] Clean up Oracle variables - complete centralization

- Add dbhome variable to group_vars/all.yml for consistency
- Remove duplicate Oracle variables from oracle-db-install defaults
- Standardize oracle_home definition across all roles
- Keep only role-specific variables in individual role defaults
- All common variables now centralized in group_vars/all.yml
---
 group_vars/all.yml                        | 10 ++++++++--
 roles/oracle-db-install/defaults/main.yml | 13 ++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/group_vars/all.yml b/group_vars/all.yml
index 35b70f1..e202ac7 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -4,8 +4,14 @@
 
 oracle_version: "19.0.0"
 oracle_base: "/u01/app/oracle"
-oracle_home: "{{ oracle_base }}/product/{{oracle_version}}/dbhome_1"
+dbhome: "dbhome_1"
+oracle_home: "{{ oracle_base }}/product/{{oracle_version}}/{{ dbhome }}"
 oracle_inventory: "/u01/app/oraInventory"
 oracle_sources: "/u01/sources"
 oracle_oradata: "/u02/oradata/"
-oracle_fra: "/u03/fast_recovery_area/"
\ No newline at end of file
+oracle_fra: "/u03/fast_recovery_area/"
+
+full_configuration: true
+secure_configuration: false
+
+scripts_dir: "/home/oracle/scripts"
\ No newline at end of file
diff --git a/roles/oracle-db-install/defaults/main.yml b/roles/oracle-db-install/defaults/main.yml
index 99ea990..81f323e 100644
--- a/roles/oracle-db-install/defaults/main.yml
+++ b/roles/oracle-db-install/defaults/main.yml
@@ -1,14 +1,7 @@
 ---
 # Variables par défaut surchargeables pour oracle-db-install
+# Les variables communes sont lues depuis group_vars/all.yml
 
-oracle_version: "19.0.0"
-oracle_base: "/u01/app/oracle"
-dbhome: "dbhome_1"
-oracle_home: "{{ oracle_base }}/product/{{oracle_version}}/{{ dbhome }}"
-oracle_inventory: "/u01/app/oraInventory"
-oracle_sources: "/u01/sources"
-oracle_oradata: "/u02/oradata/"
-oracle_fra: "/u03/fast_recovery_area/"
 oracle_install_edition: "EE"
 oracle_zip_filename: "Oracle_Database_19.3.0.0.0_for_Linux_x86-64.zip"
 
@@ -24,6 +17,4 @@ tmp_size_gb: 1
 patch_dir: "{{ oracle_sources }}"
 opatch_file: p6880880_190000_Linux-x86-64.zip
 psu_file: patch_ru.zip
-patch_number: 36233263
-
-scripts_dir: "/home/oracle/scripts"
\ No newline at end of file
+patch_number: 36233263
\ No newline at end of file