Skip to content

Commit 0caa95f

Browse files
committed
oradb_manage_pdb: added missing defaults for pdbadmin_user and pdbadmin_password
1 parent 2d081f4 commit 0caa95f

File tree

5 files changed

+51
-5
lines changed

5 files changed

+51
-5
lines changed

changelogs/fragments/pdbadmin.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
minor_changes:
3+
- "oradb_manage_pdb: added missing defaults for pdbadmin_user and pdbadmin_password (oravirt#426)"

extensions/molecule/shared_config/inventory/group_vars/all/oracle_db.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ oracle_pdbs:
164164
- cdb: DB1
165165
home: db19-si-ee
166166
pdb_name: ORCLPDB
167+
pdbadmin_user: PDBROOT
167168
listener_port: 1521
168169
state: present
169170
datafile_dest: /u01/app/oracle/oradata

extensions/molecule/shared_config/inventory/group_vars/all/password.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ oracle_wallet_password:
33
wallet1: "aA_{{ ansible_machine_id }}"
44

55
default_dbpass: Oracle_123
6-
# dbpasswords:
7-
# DB1:
8-
# sys: Oracle_123
9-
# ORCLPDB:
10-
# sys: Oracle_123
6+
dbpasswords:
7+
DB1:
8+
SYS: Oracle123
9+
ORCLPDB:
10+
PDBROOT: pdb

roles/oradb_manage_pdb/README.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Manage pluggable databases in Oracle
55
## Table of content
66

77
- [Requirements](#requirements)
8+
- [Default Variables](#default-variables)
9+
- [pdbadmin_password](#pdbadmin_password)
10+
- [pdbadmin_user](#pdbadmin_user)
811
- [Discovered Tags](#discovered-tags)
912
- [Dependencies](#dependencies)
1013
- [License](#license)
@@ -16,6 +19,32 @@ Manage pluggable databases in Oracle
1619

1720
- Minimum Ansible version: `2.14.0`
1821

22+
## Default Variables
23+
24+
### pdbadmin_password
25+
26+
Password for pdb_admin user.
27+
28+
#### Default value
29+
30+
```YAML
31+
pdbadmin_password: >-
32+
{{ dbpasswords[odb.1.cdb][odb.1.pdb_name][pdbadmin_user] | default(default_dbpass)
33+
}}
34+
```
35+
36+
### pdbadmin_user
37+
38+
Default pdb_admin user for newly created PDBs.
39+
40+
Could be set in `oracle_pdbs` to define different pdb_admin user for each PDB.
41+
42+
#### Default value
43+
44+
```YAML
45+
pdbadmin_user: >-
46+
{{ odb[1].pdbadmin_user | default('PDBADMIN') }}
47+
```
1948

2049
## Discovered Tags
2150

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,14 @@
11
---
2+
# @var pdbadmin_user:description: >
3+
# Default pdb_admin user for newly created PDBs.
4+
#
5+
# Could be set in `oracle_pdbs` to define different pdb_admin user for each PDB.
6+
# @end
7+
pdbadmin_user: >-
8+
{{ odb[1].pdbadmin_user | default('PDBADMIN') }}
9+
10+
# @var pdbadmin_password:description: >
11+
# Password for pdb_admin user.
12+
# @end
13+
pdbadmin_password: >-
14+
{{ dbpasswords[odb.1.cdb][odb.1.pdb_name][pdbadmin_user] | default(default_dbpass) }}

0 commit comments

Comments
 (0)