Skip to content
Open
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
4 changes: 2 additions & 2 deletions terraform/essbase.auto.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0.1_250805"
essbase_listing_resource_id = "ocid1.image.oc1..aaaaaaaagpq4a3lxwmdnmykcspwoys222k67xpaqj2visggof6atkfzqiotq"
4 changes: 2 additions & 2 deletions terraform/essbase.auto.tfvars.ucm
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0.1_250805"
essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaalujvgnvdkyjbof4ve7mc6v7t3v34r46mpcet5yufy7a7kskwwhoq"
2 changes: 2 additions & 0 deletions terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
}
Expand Down
4 changes: 3 additions & 1 deletion terraform/modules/database/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions terraform/modules/essbase-node/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ variable "identity_provider" {
variable "idcs_config" {
type = object({
tenant = string,
idcs_host = string,
client_id = string,
client_secret_id = string
})
Expand Down
1 change: 1 addition & 0 deletions terraform/modules/essbase/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ variable "identity_provider" {
variable "idcs_config" {
type = object({
tenant = string,
idcs_host = string,
client_id = string,
client_secret_id = string
})
Expand Down
7 changes: 7 additions & 0 deletions terraform/modules/idcs/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
18 changes: 18 additions & 0 deletions terraform/schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ groupings:
- title: "Identity Configuration"
variables:
- ${identity_provider}
- ${idcs_host}
- ${idcs_tenant}
- ${idcs_client_id}
- ${idcs_external_admin_username}
Expand Down Expand Up @@ -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-<guid>, and is part of the host name that you use to access IDCS/IAM.
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,11 @@ variable "idcs_tenant" {
# }
}

variable "idcs_host" {
type = string
default = "identity.oraclecloud.com"
}

variable "idcs_client_id" {
type = string
default = ""
Expand Down