Skip to content

Commit a09c65c

Browse files
rachavanrachavan
authored
Merge development branch to main (#335)
Merge development branch to main for 25.4.1 release
1 parent 542ce94 commit a09c65c

File tree

15 files changed

+2398
-39
lines changed

15 files changed

+2398
-39
lines changed

‎builds/build_orm_dev.sh‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright (c) 2023, Oracle and/or its affiliates.
3+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
44
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
55

66
#######################################################################################################
@@ -14,9 +14,9 @@ help()
1414
{
1515
echo "Build the Oracle Resource Manager (ORM) bundles for developers to deploy in Marketplace"
1616
echo
17-
echo "Arguments: build_orm_dev.sh -v|--version <12.2.1.4|14.1.1.0|14.1.2.0> -t|--scripts_version --all"
17+
echo "Arguments: build_orm_dev.sh -v|--version <12.2.1.4|14.1.1.0|14.1.2.0|15.1.1.0> -t|--scripts_version --all"
1818
echo "options:"
19-
echo "-v, --version WebLogic version. Supported values are 12.2.1.4,14.1.2.0 or 14.1.1.0 Optional when --all option is provided"
19+
echo "-v, --version WebLogic version. Supported values are 12.2.1.4, 14.1.2.0, 15.1.1.0, or 14.1.1.0. Optional when --all option is provided"
2020
echo "-t, --scripts_version VM scripts version"
2121
echo "--all All bundles"
2222
echo
@@ -73,7 +73,7 @@ validate()
7373
echo "WebLogic version is not provided"
7474
help
7575
exit 1
76-
elif [ "${WLS_VERSION}" != "12.2.1.4" ] && [ "${WLS_VERSION}" != "14.1.2.0" ] && [ "${WLS_VERSION}" != "14.1.1.0" ]; then
76+
elif [ "${WLS_VERSION}" != "12.2.1.4" ] && [ "${WLS_VERSION}" != "14.1.2.0" ] && [ "${WLS_VERSION}" != "15.1.1.0" ] && [ "${WLS_VERSION}" != "14.1.1.0" ]; then
7777
echo "Please provide valid WebLogic version"
7878
help
7979
exit 1
@@ -113,6 +113,13 @@ create_14120_bundle()
113113
replace_14120_variables
114114
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-14120.zip *; rm -Rf ${TMP_BUILD}/*)
115115
}
116+
create_15110_bundle()
117+
{
118+
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_15110.yaml ${TMP_BUILD}
119+
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
120+
replace_15110_variables
121+
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-15110.zip *; rm -Rf ${TMP_BUILD}/*)
122+
}
116123

117124
#need to change it to false after RM UI fix
118125
replace_12214_variables()
@@ -137,16 +144,26 @@ replace_14120_variables()
137144
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/mp_variables.tf
138145
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = \"'"$SCRIPTS_VERSION"'\"' ${TMP_BUILD}/variables.tf
139146
}
147+
replace_15110_variables()
148+
{
149+
sed -i '/variable "generate_dg_tag" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/variables.tf
150+
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"15.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
151+
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/mp_variables.tf
152+
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = \"'"$SCRIPTS_VERSION"'\"' ${TMP_BUILD}/variables.tf
153+
}
140154

141155
if [ "${CREATE_ALL_BUNDLES}" == "true" ]; then
142156
create_12214_bundle
143157
create_14110_bundle
144158
create_14120_bundle
159+
create_15110_bundle
145160
else
146161
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
147162
create_12214_bundle
148163
elif [ "${WLS_VERSION}" == "14.1.2.0" ]; then
149164
create_14120_bundle
165+
elif [ "${WLS_VERSION}" == "15.1.1.0" ]; then
166+
create_15110_bundle
150167
else
151168
create_14110_bundle
152169
fi

‎terraform/locals.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
locals {
@@ -111,6 +111,7 @@ locals {
111111
local.jdk_labels,
112112
var.wls_version == "14.1.1.0" ? var.wls_14c_jdk_version :
113113
var.wls_version == "14.1.2.0" ? var.wls_14120_jdk_version :
114+
var.wls_version == "15.1.1.0" ? var.wls_15110_jdk_version :
114115
var.wls_version == "11.1.1.7" ? "jdk7" : "jdk8"
115116
)
116117

‎terraform/main.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
### Removing network validation script from provisioning flow temporarily.
@@ -625,6 +625,7 @@ module "compute" {
625625
use_regional_subnet = local.use_regional_subnet
626626
wls_14c_jdk_version = var.wls_14c_jdk_version
627627
wls_14120_jdk_version = var.wls_14120_jdk_version
628+
wls_15110_jdk_version = var.wls_15110_jdk_version
628629
wls_admin_user = local.wls_admin_user
629630
wls_admin_password_id = var.wls_admin_password_id
630631
wls_admin_server_name = format("%s_adminserver", local.service_name_prefix)

‎terraform/modules/compute/wls_compute/wls_compute.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
module "compute-keygen" {
@@ -67,7 +67,7 @@ module "wls-instances" {
6767
wls_edition = var.wls_edition
6868
is_bastion_instance_required = var.is_bastion_instance_required
6969
create_policies = var.create_policies
70-
enable_restful_management_services = var.wls_version == "14.1.2.0" ? true : false
70+
enable_restful_management_services = contains(["14.1.2.0", "15.1.1.0"], var.wls_version)
7171
# Secured Production Mode
7272
configure_secure_mode = var.configure_secure_mode
7373
preserve_boot_properties = var.preserve_boot_properties
@@ -87,7 +87,7 @@ module "wls-instances" {
8787
wls_version = var.wls_version
8888
wls_14c_jdk_version = var.wls_14c_jdk_version
8989
fmiddleware_zip = var.wls_version_to_fmw_map[var.wls_version]
90-
jdk_zip = var.wls_version == "14.1.1.0" ? var.wls_14c_to_jdk_map[var.wls_14c_jdk_version] :var.wls_version == "14.1.2.0" ? var.wls_14120_to_jdk_map[var.wls_14120_jdk_version] :var.wls_version_to_jdk_map[var.wls_version]
90+
jdk_zip = var.wls_version == "14.1.1.0" ? var.wls_14c_to_jdk_map[var.wls_14c_jdk_version] : var.wls_version == "14.1.2.0" ? var.wls_14120_to_jdk_map[var.wls_14120_jdk_version] : var.wls_version == "15.1.1.0" ? var.wls_15110_to_jdk_map[var.wls_15110_jdk_version] : var.wls_version_to_jdk_map[var.wls_version]
9191
vmscripts_path = var.vmscripts_path
9292
log_level = var.log_level
9393
mw_vol_mount_point = lookup(var.volume_map[0], "volume_mount_point")

‎terraform/modules/compute/wls_compute/wls_variables.tf‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
variable "wls_edition" {
@@ -167,10 +167,10 @@ variable "wls_admin_server_wait_timeout_mins" {
167167

168168
variable "wls_version" {
169169
type = string
170-
description = "The WebLogic version to be installed in this instance. Accepted values are: 12.2.1.4, 14.1.1.0"
170+
description = "The WebLogic version to be installed in this instance. Accepted values are: 12.2.1.4, 14.1.1.0, 14.1.2.0, 15.1.1.0"
171171
validation {
172-
condition = contains(["12.2.1.4", "14.1.1.0", "14.1.2.0"], var.wls_version)
173-
error_message = "WLSC-ERROR: WebLogic Versions 12.2.1.4 , 14.1.1.0 and 14.1.2.0 are the only versions supported."
172+
condition = contains(["12.2.1.4", "14.1.1.0", "14.1.2.0", "15.1.1.0"], var.wls_version)
173+
error_message = "WLSC-ERROR: WebLogic Versions 12.2.1.4 , 14.1.1.0, 14.1.2.0, and 15.1.1.0 are the only versions supported."
174174
}
175175
}
176176

@@ -191,6 +191,16 @@ variable "wls_14120_jdk_version" {
191191
error_message = "WLSC-ERROR: Only jdk17 and jdk21 are supported with WebLogic version 14.1.2.0."
192192
}
193193
}
194+
195+
variable "wls_15110_jdk_version" {
196+
type = string
197+
description = "JDK version to use when installing WebLogic 15.1.1.0. Ignored when WebLogic version is not 15. Allowed values: jdk17, jdk21"
198+
validation {
199+
condition = var.wls_15110_jdk_version == "" || contains(["jdk17", "jdk21"], var.wls_15110_jdk_version)
200+
error_message = "WLSC-ERROR: Only jdk17 and jdk21 are supported with WebLogic version 15.1.1.0."
201+
}
202+
}
203+
194204
variable "wls_version_to_fmw_map" {
195205
type = map(string)
196206
description = "Defines the mapping between wls_version and corresponding FMW zip"
@@ -199,6 +209,7 @@ variable "wls_version_to_fmw_map" {
199209
"12.2.1.4" = "/u01/zips/jcs/FMW/12.2.1.4.0/fmiddleware.zip"
200210
"14.1.1.0" = "/u01/zips/jcs/FMW/14.1.1.0.0/fmiddleware.zip"
201211
"14.1.2.0" = "/u01/zips/jcs/FMW/14.1.2.0.0/fmiddleware.zip"
212+
"15.1.1.0" = "/u01/zips/jcs/FMW/15.1.1.0.0/fmiddleware.zip"
202213
}
203214
}
204215

@@ -228,6 +239,16 @@ variable "wls_14120_to_jdk_map"{
228239
"jdk21" = "/u01/zips/jcs/JDK21.0/jdk.zip"
229240
}
230241
}
242+
243+
variable "wls_15110_to_jdk_map"{
244+
type = map(string)
245+
description = "Defines the mapping between jdk version and corresponding JDK zip."
246+
default = {
247+
"jdk17" = "/u01/zips/jcs/JDK17.0/jdk.zip"
248+
"jdk21" = "/u01/zips/jcs/JDK21.0/jdk.zip"
249+
}
250+
}
251+
231252
variable "wls_version_to_rcu_component_list_map" {
232253
type = map(string)
233254
description = "Defines the mapping between wls_version version and corresponding RCU components."

‎terraform/modules/lb/loadbalancer/outputs.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
output "wls_loadbalancer_id" {
@@ -7,6 +7,6 @@ output "wls_loadbalancer_id" {
77
}
88

99
output "wls_loadbalancer_ip_addresses" {
10-
value = oci_load_balancer_load_balancer.wls_loadbalancer.ip_addresses
10+
value = oci_load_balancer_load_balancer.wls_loadbalancer.ip_address_details[*].ip_address
1111
description = "The list of IP addresses of the load balancer"
1212
}

‎terraform/modules/policies/locals.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
locals {
@@ -123,7 +123,7 @@ locals {
123123
])
124124

125125
#Policies for creating wildcard certificate to configure SSL in secured production mode
126-
secure_mode_statement1 = var.configure_secure_mode ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use certificate-authority-delegates in compartment id ${var.cert_compartment_id}" : ""
126+
secure_mode_statement1 = var.configure_secure_mode ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use certificate-authority-delegates in compartment id ${var.root_ca_compartment_id}" : ""
127127
secure_mode_statement2 = var.configure_secure_mode ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to manage leaf-certificates in compartment id ${var.cert_compartment_id}" : ""
128128
secure_mode_statement3 = var.configure_secure_mode ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to read leaf-certificate-bundles in compartment id ${var.cert_compartment_id} where target.leaf-certificate.bundle-type = 'CERTIFICATE_CONTENT_PUBLIC_ONLY'" : ""
129129
secure_mode_statement4 = var.configure_secure_mode ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to read certificate-authorities in compartment id ${var.root_ca_compartment_id}" : ""

‎terraform/modules/validators/validators.tf‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
locals {
@@ -14,6 +14,10 @@ locals {
1414

1515
is14110Version = var.wls_version == "14.1.1.0"
1616
invalid_14110_jrf = local.is14110Version && (var.is_atp_db || var.is_oci_db || var.oci_db_connection_string != "")
17+
18+
is15110Version = var.wls_version == "15.1.1.0"
19+
invalid_15110_jrf = local.is15110Version && (var.is_atp_db || var.is_oci_db || var.oci_db_connection_string != "")
20+
1721
invalid_multiple_infra_dbs = ((var.is_oci_db || var.oci_db_connection_string != "") && var.is_atp_db)
1822
both_vcn_param = local.has_existing_vcn && local.has_vcn_name
1923

@@ -28,8 +32,11 @@ locals {
2832
multiple_infra_dbs_msg = "WLSC-ERROR: Both OCI and ATP database parameters are provided. Only one infra database is required."
2933
validate_invalid_multiple_infra_dbs = local.invalid_multiple_infra_dbs ? local.validators_msg_map[local.multiple_infra_dbs_msg] : null
3034

31-
jrf_14110_msg = "WLSC-ERROR: JRF domain is not supported for FMW 14.1.1.0 version"
32-
validate_14c_jrf = local.invalid_14110_jrf ? local.validators_msg_map[local.jrf_14110_msg] : ""
35+
jrf_14110_msg = "WLSC-ERROR: JRF domain is not supported for FMW 14.1.1.0 version"
36+
validate_14c_jrf = local.invalid_14110_jrf ? local.validators_msg_map[local.jrf_14110_msg] : ""
37+
38+
jrf_15110_msg = "WLSC-ERROR: JRF domain is not supported for 15.1.1.0 version"
39+
validate_15110_jrf = local.invalid_15110_jrf ? local.validators_msg_map[local.jrf_15110_msg] : ""
3340

3441
missing_dynamic_group_oci_logging_enabled_create_policies_unset = "WLSC-ERROR: Dynamic Group id is required when enabling integration with OCI Logging Service with create policies unset "
3542
validate_dynamic_group_oci_logging_enabled_create_policies_unset = !var.create_policies && var.use_oci_logging && var.dynamic_group_id == "" ? local.validators_msg_map[local.missing_dynamic_group_oci_logging_enabled_create_policies_unset] : null

‎terraform/modules/validators/variables.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
variable "compartment_id" {
@@ -152,10 +152,10 @@ variable "lb_subnet_2_id" {
152152

153153
variable "wls_version" {
154154
type = string
155-
description = "The WebLogic version to be installed for this stack. Accepted values are: 12.2.1.4, 14.1.1.0"
155+
description = "The WebLogic version to be installed for this stack. Accepted values are: 12.2.1.4, 14.1.1.0, 14.1.2.0, 15.1.1.0"
156156
validation {
157-
condition = contains(["12.2.1.4", "14.1.1.0","14.1.2.0"], var.wls_version)
158-
error_message = "WLSC-ERROR: Allowed values for wls_version are 12.2.1.4, 14.1.1.0, 14.1.2.0."
157+
condition = contains(["12.2.1.4", "14.1.1.0","14.1.2.0", "15.1.1.0"], var.wls_version)
158+
error_message = "WLSC-ERROR: Allowed values for wls_version are 12.2.1.4, 14.1.1.0, 14.1.2.0, 15.1.1.0."
159159
}
160160
}
161161

‎terraform/schema.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
title: Oracle WebLogic Server for Oracle Cloud Infrastructure
@@ -247,6 +247,7 @@ groupings:
247247
- ${wait_time_wls_vnc_dns_resolver}
248248
- ${wls_14c_jdk_version}
249249
- ${wls_14120_jdk_version}
250+
- ${wls_15110_jdk_version}
250251
- ${wls_admin_port_source_cidr}
251252
- ${wlsoci_vmscripts_zip_bundle_path}
252253
- ${tf_script_version}
@@ -2754,4 +2755,5 @@ variables:
27542755
- 12.2.1.4
27552756
- 14.1.1.0
27562757
- 14.1.2.0
2758+
- 15.1.1.0
27572759
default: 12.2.1.4

0 commit comments

Comments
 (0)