Skip to content

Commit 93033ca

Browse files
committed
oradb-manage-db & oradb-create: added support for db_unique_name in 11.2, 12.1
This is a follow up to commit d5235e1
1 parent 8f6c5ce commit 93033ca

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

roles/oradb-create/templates/dbca-create-db.rsp.11.2.0.3.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ POLICYMANAGED = "false"
175175
# Default value : <db_name> specified in GDBNAME
176176
# Mandatory : No
177177
#-----------------------------------------------------------------------------
178-
SID = "{{ item.0.oracle_db_name }}"
178+
SID = {{ item.0.oracle_db_instance_name | default(item.0.oracle_db_name) }}
179179

180180
#-----------------------------------------------------------------------------
181181
# Name : NODELIST

roles/oradb-create/templates/dbca-create-db.rsp.11.2.0.4.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ POLICYMANAGED = "false"
176176
# Default value : <db_name> specified in GDBNAME
177177
# Mandatory : No
178178
#-----------------------------------------------------------------------------
179-
SID = "{{ item.0.oracle_db_name }}"
179+
SID = {{ item.0.oracle_db_instance_name | default(item.0.oracle_db_name) }}
180180

181181
#-----------------------------------------------------------------------------
182182
# Name : NODELIST

roles/oradb-create/templates/dbca-create-db.rsp.12.1.0.1.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ RACONENODESERVICENAME={{ item.0.service_name }}
206206
# Default value : <db_name> specified in GDBNAME
207207
# Mandatory : No
208208
#-----------------------------------------------------------------------------
209-
SID = "{{ item.0.oracle_db_name }}"
209+
SID = {{ item.0.oracle_db_instance_name | default(item.0.oracle_db_name) }}
210210

211211
#-----------------------------------------------------------------------------
212212
# Name : CREATEASCONTAINERDATABASE

roles/oradb-create/templates/dbca-create-db.rsp.12.1.0.2.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ RACONENODESERVICENAME={{ item.0.service_name }}
207207
# Default value : <db_name> specified in GDBNAME
208208
# Mandatory : No
209209
#-----------------------------------------------------------------------------
210-
SID = "{{ item.0.oracle_db_name }}"
210+
SID = {{ item.0.oracle_db_instance_name | default(item.0.oracle_db_name) }}
211211

212212
#-----------------------------------------------------------------------------
213213
# Name : CREATEASCONTAINERDATABASE

roles/oradb-manage-db/templates/dbca-create-db.rsp.11.2.0.3.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ POLICYMANAGED = "false"
175175
# Default value : <db_name> specified in GDBNAME
176176
# Mandatory : No
177177
#-----------------------------------------------------------------------------
178-
SID = "{{ dbh.oracle_db_name }}"
178+
SID = {{ dbh.oracle_db_instance_name | default(dbh.oracle_db_name) }}
179179

180180
#-----------------------------------------------------------------------------
181181
# Name : NODELIST

roles/oradb-manage-db/templates/dbca-create-db.rsp.11.2.0.4.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ POLICYMANAGED = "false"
176176
# Default value : <db_name> specified in GDBNAME
177177
# Mandatory : No
178178
#-----------------------------------------------------------------------------
179-
SID = "{{ dbh.oracle_db_name }}"
179+
SID = {{ dbh.oracle_db_instance_name | default(dbh.oracle_db_name) }}
180180

181181
#-----------------------------------------------------------------------------
182182
# Name : NODELIST

roles/oradb-manage-db/templates/dbca-create-db.rsp.12.1.0.1.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ RACONENODESERVICENAME={{ dbh.service_name }}
206206
# Default value : <db_name> specified in GDBNAME
207207
# Mandatory : No
208208
#-----------------------------------------------------------------------------
209-
SID = "{{ dbh.oracle_db_name }}"
209+
SID = {{ dbh.oracle_db_instance_name | default(dbh.oracle_db_name) }}
210210

211211
#-----------------------------------------------------------------------------
212212
# Name : CREATEASCONTAINERDATABASE

roles/oradb-manage-db/templates/dbca-create-db.rsp.12.1.0.2.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ RACONENODESERVICENAME={{ dbh.service_name }}
207207
# Default value : <db_name> specified in GDBNAME
208208
# Mandatory : No
209209
#-----------------------------------------------------------------------------
210-
SID = "{{ dbh.oracle_db_name }}"
210+
SID = {{ dbh.oracle_db_instance_name | default(dbh.oracle_db_name) }}
211211

212212
#-----------------------------------------------------------------------------
213213
# Name : CREATEASCONTAINERDATABASE

0 commit comments

Comments
 (0)