diff --git a/terraform/essbase.auto.tfvars b/terraform/essbase.auto.tfvars index 16e27d9..1a3e3ec 100644 --- a/terraform/essbase.auto.tfvars +++ b/terraform/essbase.auto.tfvars @@ -3,5 +3,5 @@ # Listing details for the Essbase custom image for Bring Your Own License. ## Copyright (c) 2019 - 2023 Oracle and/or its affiliates. essbase_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaqyxur5zacfln6epkbm46sdu5whf6zepbm43b63rm44d5hnm2ft5a" -essbase_listing_resource_version = "21.7.0.0.2_250116" -essbase_listing_resource_id = "ocid1.image.oc1..aaaaaaaaleed7c2ms752lm2hpwssxhfreyaakj3uhpgelca6mde3q5u6s6ya" +essbase_listing_resource_version = "21.7.2.0.1_250530" +essbase_listing_resource_id = "ocid1.image.oc1..aaaaaaaa3bsrlznlhabomte5nj6cvo5rfbneqsiaqt7vur7pi5x6bp6x72ya" diff --git a/terraform/essbase.auto.tfvars.ucm b/terraform/essbase.auto.tfvars.ucm index 82d2eca..a13c0e2 100644 --- a/terraform/essbase.auto.tfvars.ucm +++ b/terraform/essbase.auto.tfvars.ucm @@ -4,5 +4,5 @@ # Listing details for the Essbase custom image. # The resource_id values here should match the build script and oci_images.tf essbase_listing_id="ocid1.appcataloglisting.oc1..aaaaaaaanstxnoz6uttexhw5jfpqhu4gkwsp2ebmw4i2p7gkq65sr3e7z4gq" -essbase_listing_resource_version="21.7.0.0.2_250116" -essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaa6pujeefutsyumltxd23zwqkpm6b44tkosp2fvvurptiiyuyszb3q" +essbase_listing_resource_version="21.7.2.0.1_250530" +essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaa3z4j3t5ctqkqvqzzquor7koo6kged4zxyrc4wnpulvi26pbbb7ta" diff --git a/terraform/main.tf b/terraform/main.tf index e7939eb..676ff07 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -57,6 +57,7 @@ module "idcs" { count = (var.identity_provider == "idcs" && !var.is_upgrade) ? 1 : 0 idcs_tenant = var.idcs_tenant + idcs_host = var.idcs_host idcs_client_id = var.idcs_client_id idcs_client_secret_id = var.idcs_client_secret_id idcs_external_admin_username = var.idcs_external_admin_username @@ -275,6 +276,7 @@ module "essbase" { identity_provider = var.identity_provider idcs_config = var.identity_provider != "idcs" ? null : { tenant = var.idcs_tenant, + idcs_host = var.idcs_host, client_id = var.idcs_client_id, client_secret_id = var.idcs_client_secret_id, } diff --git a/terraform/modules/database/main.tf b/terraform/modules/database/main.tf index 79172cf..9d0a0a5 100644 --- a/terraform/modules/database/main.tf +++ b/terraform/modules/database/main.tf @@ -103,13 +103,15 @@ resource "oci_core_network_security_group_security_rule" "vcn_nsg_rule3" { resource "oci_database_autonomous_database" "autonomous_database" { admin_password = local.bootstrap_password compartment_id = var.compartment_id - cpu_core_count = "1" + # cpu_core_count = "1" # parameter invalid if compute_model is ECPU data_storage_size_in_tbs = "1" db_name = var.db_name db_workload = var.db_workload == "Autonomous Transaction Processing" ? "OLTP" : "DW" is_auto_scaling_enabled = true subnet_id = local.secure_count == 1 ? var.subnet_id : null nsg_ids = local.secure_count == 1 ? [oci_core_network_security_group.vcn_nsg[0].id] : null + compute_model = "ECPU" + compute_count = "4.0" # Minimum value is 1 for ECPU model. 1 OCPU = 4 ECPU display_name = "${var.display_name_prefix}-database" freeform_tags = var.freeform_tags diff --git a/terraform/modules/essbase-node/variables.tf b/terraform/modules/essbase-node/variables.tf index 2d12f51..9ff4ae8 100644 --- a/terraform/modules/essbase-node/variables.tf +++ b/terraform/modules/essbase-node/variables.tf @@ -121,6 +121,7 @@ variable "identity_provider" { variable "idcs_config" { type = object({ tenant = string, + idcs_host = string, client_id = string, client_secret_id = string }) diff --git a/terraform/modules/essbase/variables.tf b/terraform/modules/essbase/variables.tf index 60de92b..24af9c4 100644 --- a/terraform/modules/essbase/variables.tf +++ b/terraform/modules/essbase/variables.tf @@ -173,6 +173,7 @@ variable "identity_provider" { variable "idcs_config" { type = object({ tenant = string, + idcs_host = string, client_id = string, client_secret_id = string }) diff --git a/terraform/modules/idcs/variables.tf b/terraform/modules/idcs/variables.tf index 27b6982..64a9202 100644 --- a/terraform/modules/idcs/variables.tf +++ b/terraform/modules/idcs/variables.tf @@ -11,6 +11,13 @@ variable "idcs_tenant" { } } +variable "idcs_host" { + type = string + default = "identity.oraclecloud.com" + + # No validation. String can be left empty and default would be taken as identity.oraclecloud.com +} + variable "idcs_client_id" { type = string default = "" diff --git a/terraform/schema.yaml b/terraform/schema.yaml index aff496b..0c786bb 100644 --- a/terraform/schema.yaml +++ b/terraform/schema.yaml @@ -63,6 +63,7 @@ groupings: - title: "Identity Configuration" variables: - ${identity_provider} + - ${idcs_host} - ${idcs_tenant} - ${idcs_client_id} - ${idcs_external_admin_username} @@ -1535,6 +1536,20 @@ variables: not: - ${is_upgrade} + idcs_host: + title: IDCS/IAM Endpoint URL + description: By default it is identity.oraclecloud.com for most commercial regions - change only if needed. + type: string + visible: + and: + - eq: + - ${identity_provider} + - idcs + - not: + - ${is_upgrade} + required: true + default: identity.oraclecloud.com + idcs_tenant: title: IDCS/IAM Instance GUID description: The ID of your IDCS/IAM instance, which typically has the format idcs-, and is part of the host name that you use to access IDCS/IAM. @@ -1697,6 +1712,9 @@ outputs: rcu_schema_prefix: title: RCU Schema Prefix type: string + idcs_host: + title: IDCS/IAM Endpoint + type: string idcs_tenant: title: IDCS/IAM Instance GUID type: string diff --git a/terraform/variables.tf b/terraform/variables.tf index ca93e15..3cd8018 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -299,6 +299,11 @@ variable "idcs_tenant" { # } } +variable "idcs_host" { + type = string + default = "identity.oraclecloud.com" +} + variable "idcs_client_id" { type = string default = ""