Skip to content

Commit e5b6d2f

Browse files
committed
Removed oracle_password - use default_gipass as replacement
1 parent dd6bcfe commit e5b6d2f

File tree

7 files changed

+16
-36
lines changed

7 files changed

+16
-36
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
breaking_changes:
3+
- "Removed oracle_password - use default_gipass as replacement (oravirt#409)"

roles/oradb_manage_db/vars/main.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,13 @@ _oradb_manage_db_dbca_system_pass: "{% if dbpasswords[odb.oracle_db_name] is def
9191
{%- else %}{{ default_dbpass }}\
9292
{%- endif %}"
9393

94-
_oradb_manage_db_default_gipass: "{{ oracle_password }}"
94+
# default_gipass could be '' when no GI/Restart is used
95+
_oradb_manage_db_default_gipass: >-
96+
{{ (oracle_install_option_gi | length > 0) | ternary(default_gipass, '') }}
9597
96-
_oradb_manage_db_sysasmpassword: "{{ oracle_password }}"
98+
# default_gipass could be '' when no GI/Restart is used
99+
_oradb_manage_db_sysasmpassword: >-
100+
{{ (oracle_install_option_gi | length > 0) | ternary(default_gipass, '') }}
97101
98-
_oradb_manage_db_asmmonitorpassword: "{{ oracle_password }}"
102+
_oradb_manage_db_asmmonitorpassword: >-
103+
{{ (oracle_install_option_gi | length > 0) | ternary(default_gipass, '') }}

roles/orahost_meta/README.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Meta role used by other roles to share variable defaults.
1818
- [oper_group](#oper_group)
1919
- [oracle_group](#oracle_group)
2020
- [oracle_inventory_loc](#oracle_inventory_loc)
21-
- [oracle_password](#oracle_password)
2221
- [oracle_rsp_stage](#oracle_rsp_stage)
2322
- [oracle_seclimits](#oracle_seclimits)
2423
- [oracle_stage](#oracle_stage)
@@ -208,22 +207,6 @@ Directory for central Oracle Inventory.
208207
oracle_inventory_loc: /u01/app/oraInventory
209208
```
210209

211-
### oracle_password
212-
213-
This is the default password for sys, system, ASM etc.
214-
215-
IMPORTANT!
216-
217-
This will be a mandatory inventory variable in the future!
218-
219-
See: https://github.com/oravirt/ansible-oracle/issues/327
220-
221-
#### Default value
222-
223-
```YAML
224-
oracle_password: Oracle123
225-
```
226-
227210
### oracle_rsp_stage
228211

229212
Defines the directory for response files for installation.

roles/orahost_meta/defaults/main.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
---
2-
# @var oracle_password:description: >
3-
# This is the default password for sys, system, ASM etc.
4-
#
5-
# IMPORTANT!
6-
#
7-
# This will be a mandatory inventory variable in the future!
8-
#
9-
# See: https://github.com/oravirt/ansible-oracle/issues/327
10-
# @end
11-
oracle_password: Oracle123
12-
132
# @var configure_host_disks:description: >
143
# Should the specified directories be on their
154
# devices -> (true), or do they live in the root-filesystem (/) -> (false).

roles/oraswgi_install/tasks/assert.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ansible.builtin.assert:
44
quiet: true
55
that:
6-
- oracle_password | length > 0
6+
- default_gipass | length > 0
77
- oracle_install_version_gi is defined
88
- oracle_gi_cluster_type in ('STANDARD', 'STANDALONE')
99
tags: always

roles/oraswgi_meta/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ASMSNMP Password for ASM.
8080
#### Default value
8181

8282
```YAML
83-
asmmonitorpassword: '{{ oracle_password }}'
83+
asmmonitorpassword: '{{ default_gipass }}'
8484
```
8585

8686
### gi_patches
@@ -137,7 +137,7 @@ SYSASM Password for ASM.
137137
#### Default value
138138

139139
```YAML
140-
sysasmpassword: '{{ oracle_password }}'
140+
sysasmpassword: '{{ default_gipass }}'
141141
```
142142

143143
## Discovered Tags

roles/oraswgi_meta/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ _oraswgi_meta_configure_cluster: false
1717
# @var sysasmpassword:description: >
1818
# SYSASM Password for ASM.
1919
# @end
20-
sysasmpassword: "{{ oracle_password }}"
20+
sysasmpassword: "{{ default_gipass }}"
2121

2222
# @var asmmonitorpassword:description: >
2323
# ASMSNMP Password for ASM.
2424
# @end
25-
asmmonitorpassword: "{{ oracle_password }}"
25+
asmmonitorpassword: "{{ default_gipass }}"
2626

2727
# @var patch_before_rootsh:description: >
2828
# Patch Grid-Infrastructure during gridSetup.sh

0 commit comments

Comments
 (0)