Skip to content

Commit fca2050

Browse files
committed
oradb-manage-*: support for service_name + listener_port
Added missing support for listener_port. The listener_port is needed inside the pdb-configuration: oracle_pdbs: - pdb_name: orclpdb1 listener_port: 1522 ...
1 parent 3dae7b7 commit fca2050

File tree

12 files changed

+30
-1
lines changed

12 files changed

+30
-1
lines changed

roles/oradb-manage-parameters/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ db_service_name: "{% if item.0 is defined %}
1717
{%- endif %}
1818
{%- endif %}"
1919

20+
listener_port_template: "{% if item.0.listener_port is defined %}{{ item.0.listener_port }}{% else %}{{ listener_port }}{% endif %}"
21+
listener_port: 1521
22+
2023
oracle_env:
2124
ORACLE_HOME: "{{ oracle_home_db }}"
2225
LD_LIBRARY_PATH: "{{ oracle_home_db }}/lib"

roles/oradb-manage-parameters/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
oracle_parameter:
33
hostname={{ ansible_hostname }}
44
service_name={{ db_service_name }}
5+
port={{ listener_port_template }}
56
user={{ db_user }}
67
password={{ db_password_cdb }}
78
mode={{ db_mode }}
@@ -25,6 +26,7 @@
2526
oracle_parameter:
2627
hostname={{ ansible_hostname }}
2728
service_name={{ item.0.pdb_name }}
29+
port={{ listener_port_template }}
2830
user={{ db_user }}
2931
password={{ db_password_pdb }}
3032
mode={{ db_mode }}

roles/oradb-manage-pdb/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ db_mode: sysdba
1010
pdbadmin_user: pdbadmin
1111
pdbadmin_password: "{% if dbpasswords is defined and dbpasswords[item[1].cdb] is defined and dbpasswords[item[1].cdb][item[1].pdb_name] is defined and dbpasswords[item[1].cdb][item[1].pdb_name][pdbadmin_user] is defined%}{{dbpasswords[item[1].cdb][item[1].pdb_name][pdbadmin_user]}}{% else %}{{ default_dbpass}}{% endif%}"
1212

13+
listener_port_template: "{% if item.0.listener_port is defined %}{{ item.0.listener_port }}{% else %}{{ listener_port }}{% endif %}"
14+
listener_port: 1521
15+
1316
oracle_env:
1417
ORACLE_HOME: "{{ oracle_home_db }}"
1518
LD_LIBRARY_PATH: "{{ oracle_home_db }}/lib"

roles/oradb-manage-pdb/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
username={{ db_user | default('sys') }}
3333
password={{ db_password_cdb }}
3434
mode={{ db_mode }}
35-
service_name={{ item[1].cdb }}
35+
service_name={{ item[0].oracle_db_unique_name | default(item[0].oracle_db_name) }}
36+
port={{ listener_port_template }}
37+
listener_port
3638
state={{ item[1].state |default(omit) }}
3739
environment: "{{oracle_env}}"
3840
run_once: "{{ configure_cluster}}"

roles/oradb-manage-redo/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ db_service_name: "{% if item.0 is defined %}
1111
{%- endif %}
1212
{%- endif %}"
1313

14+
listener_port_template: "{% if item.listener_port is defined %}{{ item.listener_port }}{% else %}{{ listener_port }}{% endif %}"
15+
listener_port: 1521
16+
1417
#db_password_cdb: "{% if dbpasswords is defined and dbpasswords[item.cdb] is defined and dbpasswords[item.cdb][db_user] is defined%}{{dbpasswords[item.cdb][db_user]}}{% else %}{{ default_dbpass}}{% endif%}"
1518
db_password_cdb: "{% if dbpasswords is defined and dbpasswords[item.oracle_db_name] is defined and dbpasswords[item.oracle_db_name][db_user] is defined%}{{dbpasswords[item.oracle_db_name][db_user]}}{% else %}{{ default_dbpass}}{% endif%}"
1619

roles/oradb-manage-redo/tasks/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
oracle_redo:
33
hostname={{ ansible_hostname }}
44
service_name={{ db_service_name }}
5+
port={{ listener_port_template }}
56
user={{ db_user }}
67
password={{ db_password_cdb }}
78
mode={{ db_mode }}

roles/oradb-manage-roles/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ db_service_name: "{% if item.0 is defined %}
1616
{%- endif %}
1717
{%- endif %}"
1818

19+
listener_port_template: "{% if item.0.listener_port is defined %}{{ item.0.listener_port }}{% else %}{{ listener_port }}{% endif %}"
20+
listener_port: 1521
21+
1922
user_cdb_password: "{% if dbpasswords is defined and dbpasswords[item.0.oracle_db_name] is defined and dbpasswords[item.0.oracle_db_name][item.1.schema] is defined %}{{dbpasswords[item.0.oracle_db_name][item.1.schema]}}{% else %}{{ default_dbpass}}{% endif%}"
2023
user_pdb_password: "{% if dbpasswords is defined and dbpasswords[item.0.cdb] is defined and dbpasswords[item.0.cdb][item.0.pdb_name] is defined and dbpasswords[item.0.cdb][item.0.pdb_name][item.1.schema] is defined%}{{dbpasswords[item.0.cdb][item.0.pdb_name][item.1.schema]}}{% else %}{{ default_dbpass}}{% endif%}"
2124

roles/oradb-manage-roles/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
role={{ item.1.name }}
66
state={{ item.1.state }}
77
hostname={{ ansible_hostname }}
8+
port={{ listener_port_template }}
89
service_name={{ db_service_name }}
910
user={{ db_user }}
1011
password={{ db_password_cdb}}
@@ -25,6 +26,7 @@
2526
role={{ item.1.name }}
2627
state={{ item.1.state }}
2728
hostname={{ ansible_hostname }}
29+
port={{ listener_port_template }}
2830
service_name={{ item.0.pdb_name }}
2931
user={{ db_user }}
3032
password={{ db_password_pdb}}

roles/oradb-manage-tablespace/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ db_service_name: "{% if item.0 is defined %}
1313
{%- endif %}
1414
{%- endif %}"
1515

16+
listener_port_template: "{% if item.0.listener_port is defined %}{{ item.0.listener_port }}{% else %}{{ listener_port }}{% endif %}"
17+
listener_port: 1521
18+
1619
oracle_env:
1720
ORACLE_HOME: "{{ oracle_home_db }}"
1821
LD_LIBRARY_PATH: "{{ oracle_home_db }}/lib"

roles/oradb-manage-tablespace/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
- name: Manage tablespaces (db/cdb)
22
oracle_tablespace:
33
hostname={{ ansible_hostname }}
4+
port={{ listener_port_template }}
45
service_name={{ db_service_name }}
56
user={{ db_user }}
67
password={{ db_password_cdb}}
@@ -27,6 +28,7 @@
2728
- name: Manage tablespaces (pdb)
2829
oracle_tablespace:
2930
hostname={{ ansible_hostname }}
31+
port={{ listener_port_template }}
3032
service_name={{ item.0.pdb_name }}
3133
user={{ db_user }}
3234
password={{ db_password_pdb}}

0 commit comments

Comments
 (0)