Skip to content

Commit 3dae7b7

Browse files
RendanicRendanic
committed
oradb-manage-*: support for service_name + listener_port
db_unique_name is changing the default name for service during connectiong to the instance. A non default port for the listener is also usable whith listener_port in oracle_databases.
1 parent 8f6c5ce commit 3dae7b7

File tree

14 files changed

+61
-11
lines changed

14 files changed

+61
-11
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ db_password_cdb: "{% if dbpasswords is defined and dbpasswords[item.0.oracle_db_
99
db_password_pdb: "{% if dbpasswords is defined and dbpasswords[item.0.cdb] is defined and dbpasswords[item.0.cdb][db_user] is defined%}{{dbpasswords[item.0.cdb][db_user]}}{% else %}{{ default_dbpass}}{% endif%}"
1010
db_mode: sysdba
1111

12+
db_service_name: "{% if item.0 is defined %}
13+
{%- if item.0.oracle_db_unique_name is defined %}{{ item.0.oracle_db_unique_name }}
14+
{%- elif item.0.oracle_db_instance_name is defined %}{{ item.0.oracle_db_instance_name }}
15+
{%- else %}{{ item.0.oracle_db_name }}
16+
{%- endif %}
17+
{%- endif %}"
18+
1219
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%}"
1320
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%}"
1421

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
state={{ item.1.state }}
77
grants={{ item.1.grants }}
88
hostname={{ ansible_hostname }}
9-
service_name={{ item.0.oracle_db_name }}
9+
service_name={{ db_service_name }}
1010
user={{ db_user }}
1111
password={{ db_password_cdb}}
1212
mode={{ db_mode }}
@@ -48,7 +48,7 @@
4848
state={{ item.1.state }}
4949
grants={{ item.1.grants }}
5050
hostname={{ ansible_hostname }}
51-
service_name={{ item.0.oracle_db_name }}
51+
service_name={{ db_service_name }}
5252
user={{ db_user }}
5353
password={{ db_password_cdb}}
5454
mode={{ db_mode }}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ db_password_pdb: "{% if dbpasswords is defined and dbpasswords[item.0.cdb] is de
1010

1111
db_mode: sysdba
1212

13+
db_service_name: "{% if item.0 is defined %}
14+
{%- if item.0.oracle_db_unique_name is defined %}{{ item.0.oracle_db_unique_name }}
15+
{%- elif item.0.oracle_db_instance_name is defined %}{{ item.0.oracle_db_instance_name }}
16+
{%- else %}{{ item.0.oracle_db_name }}
17+
{%- endif %}
18+
{%- endif %}"
19+
1320
oracle_env:
1421
ORACLE_HOME: "{{ oracle_home_db }}"
1522
LD_LIBRARY_PATH: "{{ oracle_home_db }}/lib"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- name: Manage parameters (db/cdb)
22
oracle_parameter:
33
hostname={{ ansible_hostname }}
4-
service_name={{ item.0.oracle_db_name }}
4+
service_name={{ db_service_name }}
55
user={{ db_user }}
66
password={{ db_password_cdb }}
77
mode={{ db_mode }}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ oracle_base: /u01/app/oracle
33
oracle_home_db: "{% if dbh is defined %}{% if dbh.oracle_home is defined %}{{ dbh.oracle_home }}{% else %}{{ oracle_base}}/{{ dbh.oracle_version_db }}/{{ dbh.home }}{% endif %}{% elif item.0 is defined %}{% if item.0.oracle_home is defined %}{{ item.0.oracle_home}}{% else %}{{ oracle_base }}/{{ item.0.oracle_version_db }}/{{ item.0.home }}{% endif %}{% elif item is defined %}{% if item.oracle_home is defined %}{{ item.oracle_home}}{% else %}{{ oracle_base }}/{{ item.oracle_version_db }}/{{ item.home }}{% endif %}{% endif %}"
44
db_user: system
55
db_mode: normal
6+
7+
db_service_name: "{% if item.0 is defined %}
8+
{%- if item.0.oracle_db_unique_name is defined %}{{ item.0.oracle_db_unique_name }}
9+
{%- elif item.0.oracle_db_instance_name is defined %}{{ item.0.oracle_db_instance_name }}
10+
{%- else %}{{ item.0.oracle_db_name }}
11+
{%- endif %}
12+
{%- endif %}"
13+
614
#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%}"
715
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%}"
816

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- name: Manage redologs
22
oracle_redo:
33
hostname={{ ansible_hostname }}
4-
service_name={{ item.oracle_db_name }}
4+
service_name={{ db_service_name }}
55
user={{ db_user }}
66
password={{ db_password_cdb }}
77
mode={{ db_mode }}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ db_password_cdb: "{% if dbpasswords is defined and dbpasswords[item.0.oracle_db_
99
db_password_pdb: "{% if dbpasswords is defined and dbpasswords[item.0.cdb] is defined and dbpasswords[item.0.cdb][db_user] is defined%}{{dbpasswords[item.0.cdb][db_user]}}{% else %}{{ default_dbpass}}{% endif%}"
1010
db_mode: sysdba
1111

12+
db_service_name: "{% if item.0 is defined %}
13+
{%- if item.0.oracle_db_unique_name is defined %}{{ item.0.oracle_db_unique_name }}
14+
{%- elif item.0.oracle_db_instance_name is defined %}{{ item.0.oracle_db_instance_name }}
15+
{%- else %}{{ item.0.oracle_db_name }}
16+
{%- endif %}
17+
{%- endif %}"
18+
1219
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%}"
1320
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%}"
1421

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
role={{ item.1.name }}
66
state={{ item.1.state }}
77
hostname={{ ansible_hostname }}
8-
service_name={{ item.0.oracle_db_name }}
8+
service_name={{ db_service_name }}
99
user={{ db_user }}
1010
password={{ db_password_cdb}}
1111
mode={{ db_mode }}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ db_user: system
1111
db_password_cdb: "{% if dbpasswords is defined and dbpasswords[item.0.oracle_db_name] is defined and dbpasswords[item.0.oracle_db_name][db_user] is defined%}{{dbpasswords[item.0.oracle_db_name][db_user]}}{% else %}{{ default_dbpass}}{% endif%}"
1212
db_password_pdb: "{% if dbpasswords is defined and dbpasswords[item.0.cdb] is defined and dbpasswords[item.0.cdb][db_user] is defined%}{{dbpasswords[item.0.cdb][db_user]}}{% else %}{{ default_dbpass}}{% endif%}"
1313

14+
db_service_name: "{% if item.0 is defined %}
15+
{%- if item.0.oracle_db_unique_name is defined %}{{ item.0.oracle_db_unique_name }}
16+
{%- elif item.0.oracle_db_instance_name is defined %}{{ item.0.oracle_db_instance_name }}
17+
{%- else %}{{ item.0.oracle_db_name }}
18+
{%- endif %}
19+
{%- endif %}"
20+
1421
oracle_env:
1522
ORACLE_HOME: "{{ oracle_home_db }}"
1623
LD_LIBRARY_PATH: "{{ oracle_home_db }}/lib"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
host={{ansible_hostname}}
1212
un={{ db_user }}
1313
pw={{ db_password_cdb }}
14-
sn={{ item.0.oracle_db_name }}
14+
sn={{ db_service_name }}
1515
environment: "{{oracle_env}}"
1616
run_once: "{{ configure_cluster }}"
1717
with_subelements:
@@ -57,7 +57,7 @@
5757
host={{ ansible_hostname }}
5858
un={{ db_user }}
5959
pw={{ db_password_cdb }}
60-
sn={{ item.0.oracle_db_name }}
60+
sn={{ db_service_name }}
6161
environment: "{{oracle_env}}"
6262
run_once: "{{ configure_cluster }}"
6363
with_subelements:
@@ -99,7 +99,7 @@
9999
host={{ ansible_hostname }}
100100
un={{ db_user }}
101101
pw={{ db_password_cdb }}
102-
sn={{ item.0.oracle_db_name }}
102+
sn={{ db_service_name }}
103103
environment: "{{oracle_env}}"
104104
run_once: "{{ configure_cluster }}"
105105
with_subelements:
@@ -141,7 +141,7 @@
141141
host={{ ansible_hostname }}
142142
un={{ db_user }}
143143
pw={{ db_password_cdb }}
144-
sn={{ item.0.oracle_db_name }}
144+
sn={{ db_service_name }}
145145
environment: "{{oracle_env}}"
146146
run_once: "{{ configure_cluster }}"
147147
with_subelements:

0 commit comments

Comments
 (0)