Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions builds/build_orm_dev.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

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

#######################################################################################################
Expand All @@ -14,9 +14,9 @@ help()
{
echo "Build the Oracle Resource Manager (ORM) bundles for developers to deploy in Marketplace"
echo
echo "Arguments: build_orm_dev.sh -v|--version <12.2.1.4|14.1.1.0|14.1.2.0> -t|--scripts_version --all"
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"
echo "options:"
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"
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"
echo "-t, --scripts_version VM scripts version"
echo "--all All bundles"
echo
Expand Down Expand Up @@ -73,7 +73,7 @@ validate()
echo "WebLogic version is not provided"
help
exit 1
elif [ "${WLS_VERSION}" != "12.2.1.4" ] && [ "${WLS_VERSION}" != "14.1.2.0" ] && [ "${WLS_VERSION}" != "14.1.1.0" ]; then
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
echo "Please provide valid WebLogic version"
help
exit 1
Expand Down Expand Up @@ -113,6 +113,13 @@ create_14120_bundle()
replace_14120_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-14120.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_15110_bundle()
{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_15110.yaml ${TMP_BUILD}
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
replace_15110_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-15110.zip *; rm -Rf ${TMP_BUILD}/*)
}

#need to change it to false after RM UI fix
replace_12214_variables()
Expand All @@ -137,16 +144,26 @@ replace_14120_variables()
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = \"'"$SCRIPTS_VERSION"'\"' ${TMP_BUILD}/variables.tf
}
replace_15110_variables()
{
sed -i '/variable "generate_dg_tag" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/variables.tf
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"15.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = \"'"$SCRIPTS_VERSION"'\"' ${TMP_BUILD}/variables.tf
}

if [ "${CREATE_ALL_BUNDLES}" == "true" ]; then
create_12214_bundle
create_14110_bundle
create_14120_bundle
create_15110_bundle
else
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
create_12214_bundle
elif [ "${WLS_VERSION}" == "14.1.2.0" ]; then
create_14120_bundle
elif [ "${WLS_VERSION}" == "15.1.1.0" ]; then
create_15110_bundle
else
create_14110_bundle
fi
Expand Down
3 changes: 2 additions & 1 deletion terraform/locals.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

locals {
Expand Down Expand Up @@ -111,6 +111,7 @@ locals {
local.jdk_labels,
var.wls_version == "14.1.1.0" ? var.wls_14c_jdk_version :
var.wls_version == "14.1.2.0" ? var.wls_14120_jdk_version :
var.wls_version == "15.1.1.0" ? var.wls_15110_jdk_version :
var.wls_version == "11.1.1.7" ? "jdk7" : "jdk8"
)

Expand Down
3 changes: 2 additions & 1 deletion terraform/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

### Removing network validation script from provisioning flow temporarily.
Expand Down Expand Up @@ -625,6 +625,7 @@ module "compute" {
use_regional_subnet = local.use_regional_subnet
wls_14c_jdk_version = var.wls_14c_jdk_version
wls_14120_jdk_version = var.wls_14120_jdk_version
wls_15110_jdk_version = var.wls_15110_jdk_version
wls_admin_user = local.wls_admin_user
wls_admin_password_id = var.wls_admin_password_id
wls_admin_server_name = format("%s_adminserver", local.service_name_prefix)
Expand Down
6 changes: 3 additions & 3 deletions terraform/modules/compute/wls_compute/wls_compute.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

module "compute-keygen" {
Expand Down Expand Up @@ -67,7 +67,7 @@ module "wls-instances" {
wls_edition = var.wls_edition
is_bastion_instance_required = var.is_bastion_instance_required
create_policies = var.create_policies
enable_restful_management_services = var.wls_version == "14.1.2.0" ? true : false
enable_restful_management_services = contains(["14.1.2.0", "15.1.1.0"], var.wls_version)
# Secured Production Mode
configure_secure_mode = var.configure_secure_mode
preserve_boot_properties = var.preserve_boot_properties
Expand All @@ -87,7 +87,7 @@ module "wls-instances" {
wls_version = var.wls_version
wls_14c_jdk_version = var.wls_14c_jdk_version
fmiddleware_zip = var.wls_version_to_fmw_map[var.wls_version]
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]
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]
vmscripts_path = var.vmscripts_path
log_level = var.log_level
mw_vol_mount_point = lookup(var.volume_map[0], "volume_mount_point")
Expand Down
29 changes: 25 additions & 4 deletions terraform/modules/compute/wls_compute/wls_variables.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

variable "wls_edition" {
Expand Down Expand Up @@ -167,10 +167,10 @@ variable "wls_admin_server_wait_timeout_mins" {

variable "wls_version" {
type = string
description = "The WebLogic version to be installed in this instance. Accepted values are: 12.2.1.4, 14.1.1.0"
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"
validation {
condition = contains(["12.2.1.4", "14.1.1.0", "14.1.2.0"], var.wls_version)
error_message = "WLSC-ERROR: WebLogic Versions 12.2.1.4 , 14.1.1.0 and 14.1.2.0 are the only versions supported."
condition = contains(["12.2.1.4", "14.1.1.0", "14.1.2.0", "15.1.1.0"], var.wls_version)
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."
}
}

Expand All @@ -191,6 +191,16 @@ variable "wls_14120_jdk_version" {
error_message = "WLSC-ERROR: Only jdk17 and jdk21 are supported with WebLogic version 14.1.2.0."
}
}

variable "wls_15110_jdk_version" {
type = string
description = "JDK version to use when installing WebLogic 15.1.1.0. Ignored when WebLogic version is not 15. Allowed values: jdk17, jdk21"
validation {
condition = var.wls_15110_jdk_version == "" || contains(["jdk17", "jdk21"], var.wls_15110_jdk_version)
error_message = "WLSC-ERROR: Only jdk17 and jdk21 are supported with WebLogic version 15.1.1.0."
}
}

variable "wls_version_to_fmw_map" {
type = map(string)
description = "Defines the mapping between wls_version and corresponding FMW zip"
Expand All @@ -199,6 +209,7 @@ variable "wls_version_to_fmw_map" {
"12.2.1.4" = "/u01/zips/jcs/FMW/12.2.1.4.0/fmiddleware.zip"
"14.1.1.0" = "/u01/zips/jcs/FMW/14.1.1.0.0/fmiddleware.zip"
"14.1.2.0" = "/u01/zips/jcs/FMW/14.1.2.0.0/fmiddleware.zip"
"15.1.1.0" = "/u01/zips/jcs/FMW/15.1.1.0.0/fmiddleware.zip"
}
}

Expand Down Expand Up @@ -228,6 +239,16 @@ variable "wls_14120_to_jdk_map"{
"jdk21" = "/u01/zips/jcs/JDK21.0/jdk.zip"
}
}

variable "wls_15110_to_jdk_map"{
type = map(string)
description = "Defines the mapping between jdk version and corresponding JDK zip."
default = {
"jdk17" = "/u01/zips/jcs/JDK17.0/jdk.zip"
"jdk21" = "/u01/zips/jcs/JDK21.0/jdk.zip"
}
}

variable "wls_version_to_rcu_component_list_map" {
type = map(string)
description = "Defines the mapping between wls_version version and corresponding RCU components."
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/policies/locals.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

locals {
Expand Down
13 changes: 10 additions & 3 deletions terraform/modules/validators/validators.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

locals {
Expand All @@ -14,6 +14,10 @@ locals {

is14110Version = var.wls_version == "14.1.1.0"
invalid_14110_jrf = local.is14110Version && (var.is_atp_db || var.is_oci_db || var.oci_db_connection_string != "")

is15110Version = var.wls_version == "15.1.1.0"
invalid_15110_jrf = local.is15110Version && (var.is_atp_db || var.is_oci_db || var.oci_db_connection_string != "")

invalid_multiple_infra_dbs = ((var.is_oci_db || var.oci_db_connection_string != "") && var.is_atp_db)
both_vcn_param = local.has_existing_vcn && local.has_vcn_name

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

jrf_14110_msg = "WLSC-ERROR: JRF domain is not supported for FMW 14.1.1.0 version"
validate_14c_jrf = local.invalid_14110_jrf ? local.validators_msg_map[local.jrf_14110_msg] : ""
jrf_14110_msg = "WLSC-ERROR: JRF domain is not supported for FMW 14.1.1.0 version"
validate_14c_jrf = local.invalid_14110_jrf ? local.validators_msg_map[local.jrf_14110_msg] : ""

jrf_15110_msg = "WLSC-ERROR: JRF domain is not supported for 15.1.1.0 version"
validate_15110_jrf = local.invalid_15110_jrf ? local.validators_msg_map[local.jrf_15110_msg] : ""

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 "
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
Expand Down
8 changes: 4 additions & 4 deletions terraform/modules/validators/variables.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

variable "compartment_id" {
Expand Down Expand Up @@ -152,10 +152,10 @@ variable "lb_subnet_2_id" {

variable "wls_version" {
type = string
description = "The WebLogic version to be installed for this stack. Accepted values are: 12.2.1.4, 14.1.1.0"
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"
validation {
condition = contains(["12.2.1.4", "14.1.1.0","14.1.2.0"], var.wls_version)
error_message = "WLSC-ERROR: Allowed values for wls_version are 12.2.1.4, 14.1.1.0, 14.1.2.0."
condition = contains(["12.2.1.4", "14.1.1.0","14.1.2.0", "15.1.1.0"], var.wls_version)
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."
}
}

Expand Down
4 changes: 3 additions & 1 deletion terraform/schema.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

title: Oracle WebLogic Server for Oracle Cloud Infrastructure
Expand Down Expand Up @@ -247,6 +247,7 @@ groupings:
- ${wait_time_wls_vnc_dns_resolver}
- ${wls_14c_jdk_version}
- ${wls_14120_jdk_version}
- ${wls_15110_jdk_version}
- ${wls_admin_port_source_cidr}
- ${wlsoci_vmscripts_zip_bundle_path}
- ${tf_script_version}
Expand Down Expand Up @@ -2754,4 +2755,5 @@ variables:
- 12.2.1.4
- 14.1.1.0
- 14.1.2.0
- 15.1.1.0
default: 12.2.1.4
4 changes: 3 additions & 1 deletion terraform/schema_14110.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

title: Oracle WebLogic Server for Oracle Cloud Infrastructure
Expand Down Expand Up @@ -194,6 +194,7 @@ groupings:
- ${wls_version}
- ${log_level}
- ${wls_14120_jdk_version}
- ${wls_15110_jdk_version}
#- ${instance_image_id}
- ${marketplace_source_images}
- ${use_regional_subnet}
Expand Down Expand Up @@ -2291,4 +2292,5 @@ variables:
- 12.2.1.4
- 14.1.1.0
- 14.1.2.0
- 15.1.1.0
default: 12.2.1.4
4 changes: 3 additions & 1 deletion terraform/schema_14120.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

title: Oracle WebLogic Server for Oracle Cloud Infrastructure
Expand Down Expand Up @@ -247,6 +247,7 @@ groupings:
- ${generate_dg_tag}
- ${wait_time_wls_vnc_dns_resolver}
- ${wls_14c_jdk_version}
- ${wls_15110_jdk_version}
- ${wls_admin_port_source_cidr}
- ${wlsoci_vmscripts_zip_bundle_path}
- ${tf_script_version}
Expand Down Expand Up @@ -2763,4 +2764,5 @@ variables:
- 12.2.1.4
- 14.1.1.0
- 14.1.2.0
- 15.1.1.0
default: 12.2.1.4
Loading