Removed oracle_password - use default_gipass as replacement

oravirt · Feb 24, 2024 · e5b6d2f · e5b6d2f
1 parent dd6bcfe
commit e5b6d2f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 36 deletions.
diff --git a/changelogs/fragments/default_gipass.yml b/changelogs/fragments/default_gipass.yml
@@ -0,0 +1,3 @@
+---
+breaking_changes:
+  - "Removed oracle_password - use default_gipass as replacement (oravirt#409)"
diff --git a/roles/oradb_manage_db/vars/main.yml b/roles/oradb_manage_db/vars/main.yml
@@ -91,8 +91,13 @@ _oradb_manage_db_dbca_system_pass: "{% if dbpasswords[odb.oracle_db_name] is def
                     {%- else %}{{ default_dbpass }}\
                     {%- endif %}"
 
-_oradb_manage_db_default_gipass: "{{ oracle_password }}"
+# default_gipass could be '' when no GI/Restart is used
+_oradb_manage_db_default_gipass: >-
+  {{ (oracle_install_option_gi | length > 0) | ternary(default_gipass, '') }}
 
-_oradb_manage_db_sysasmpassword: "{{ oracle_password }}"
+# default_gipass could be '' when no GI/Restart is used
+_oradb_manage_db_sysasmpassword: >-
+  {{ (oracle_install_option_gi | length > 0) | ternary(default_gipass, '') }}
 
-_oradb_manage_db_asmmonitorpassword: "{{ oracle_password }}"
+_oradb_manage_db_asmmonitorpassword: >-
+  {{ (oracle_install_option_gi | length > 0) | ternary(default_gipass, '') }}
diff --git a/roles/orahost_meta/README.md b/roles/orahost_meta/README.md
@@ -18,7 +18,6 @@ Meta role used by other roles to share variable defaults.
   - [oper_group](#oper_group)
   - [oracle_group](#oracle_group)
   - [oracle_inventory_loc](#oracle_inventory_loc)
-  - [oracle_password](#oracle_password)
   - [oracle_rsp_stage](#oracle_rsp_stage)
   - [oracle_seclimits](#oracle_seclimits)
   - [oracle_stage](#oracle_stage)
@@ -208,22 +207,6 @@ Directory for central Oracle Inventory.
 oracle_inventory_loc: /u01/app/oraInventory
 ```
 
-### oracle_password
-
-This is the default password for sys, system, ASM etc.
-
-IMPORTANT!
-
-This will be a mandatory inventory variable in the future!
-
-See: https://github.com/oravirt/ansible-oracle/issues/327
-
-#### Default value
-
-```YAML
-oracle_password: Oracle123
-```
-
 ### oracle_rsp_stage
 
 Defines the directory for response files for installation.

diff --git a/roles/orahost_meta/defaults/main.yml b/roles/orahost_meta/defaults/main.yml
@@ -1,15 +1,4 @@
 ---
-# @var oracle_password:description: >
-# This is the default password for sys, system, ASM etc.
-#
-# IMPORTANT!
-#
-# This will be a mandatory inventory variable in the future!
-#
-# See: https://github.com/oravirt/ansible-oracle/issues/327
-# @end
-oracle_password: Oracle123
-
 # @var configure_host_disks:description: >
 # Should the specified directories be on their
 # devices -> (true), or do they live in the root-filesystem (/) -> (false).

diff --git a/roles/oraswgi_install/tasks/assert.yml b/roles/oraswgi_install/tasks/assert.yml
@@ -3,7 +3,7 @@
   ansible.builtin.assert:
     quiet: true
     that:
-      - oracle_password | length > 0
+      - default_gipass | length > 0
       - oracle_install_version_gi is defined
       - oracle_gi_cluster_type in ('STANDARD', 'STANDALONE')
   tags: always

diff --git a/roles/oraswgi_meta/README.md b/roles/oraswgi_meta/README.md
@@ -80,7 +80,7 @@ ASMSNMP Password for ASM.
 #### Default value
 
 ```YAML
-asmmonitorpassword: '{{ oracle_password }}'
+asmmonitorpassword: '{{ default_gipass }}'
 ```
 
 ### gi_patches
@@ -137,7 +137,7 @@ SYSASM Password for ASM.
 #### Default value
 
 ```YAML
-sysasmpassword: '{{ oracle_password }}'
+sysasmpassword: '{{ default_gipass }}'
 ```
 
 ## Discovered Tags

diff --git a/roles/oraswgi_meta/defaults/main.yml b/roles/oraswgi_meta/defaults/main.yml
@@ -17,12 +17,12 @@ _oraswgi_meta_configure_cluster: false
 # @var sysasmpassword:description: >
 # SYSASM Password for ASM.
 # @end
-sysasmpassword: "{{ oracle_password }}"
+sysasmpassword: "{{ default_gipass }}"
 
 # @var asmmonitorpassword:description: >
 # ASMSNMP Password for ASM.
 # @end
-asmmonitorpassword: "{{ oracle_password }}"
+asmmonitorpassword: "{{ default_gipass }}"
 
 # @var patch_before_rootsh:description: >
 # Patch Grid-Infrastructure during gridSetup.sh