Merge pull request #70 from sankara911/main

Merge main branch of fork to oci-essbase quickstart main
oracle-quickstart · Jan 24, 2025 · 90a2695 · 90a2695
2 parents 0333773 + 53b740a
commit 90a2695
Show file tree

Hide file tree

Showing 48 changed files with 443 additions and 122 deletions.
diff --git a/quickstart.tfvars b/quickstart.tfvars
@@ -5,8 +5,8 @@
 # Run "terraform apply" to apply plan and create stack.
 
 essbase_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaqyxur5zacfln6epkbm46sdu5whf6zepbm43b63rm44d5hnm2ft5a"
-essbase_listing_resource_version = "21.5.0.0.1_230623"
-essbase_listing_resource_id      = "ocid1.image.oc1..aaaaaaaatbmet5aq76qywqzhgxyqbka3nj5dze3gbcr6ll43fgkl33klzw2q"
+essbase_listing_resource_version = "21.6.0.0.1_240807"
+essbase_listing_resource_id      = "ocid1.image.oc1..aaaaaaaadushb5tgvmc5w2xflif5ofddkqdq6kyy2nh4drorqcitsweyw7zq"
 
 tenancy_ocid 					= "" 		                # REPLACE
 

diff --git a/terraform/LICENSE b/terraform/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019, 2021 Oracle and/or its affiliates. 
+Copyright (c) 2019 - 2023 Oracle and/or its affiliates. 
 
 The Universal Permissive License (UPL), Version 1.0
 

diff --git a/terraform/essbase.auto.tfvars b/terraform/essbase.auto.tfvars
@@ -1,7 +1,7 @@
-## Copyright (c) 2019, 2021, 2022 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # 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.5.0.0.1_230623"
-essbase_listing_resource_id      = "ocid1.image.oc1..aaaaaaaatbmet5aq76qywqzhgxyqbka3nj5dze3gbcr6ll43fgkl33klzw2q"
+essbase_listing_resource_version = "21.6.0.0.1_240807"
+essbase_listing_resource_id      = "ocid1.image.oc1..aaaaaaaadushb5tgvmc5w2xflif5ofddkqdq6kyy2nh4drorqcitsweyw7zq"
diff --git a/terraform/essbase.auto.tfvars.ucm b/terraform/essbase.auto.tfvars.ucm
@@ -1,8 +1,8 @@
-## Copyright (c) 2019, 2021, 2022 Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # 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.5.0.0.1_230623"
-essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaayb5siifez66bpr3uh4vmv7mnxt2csus5uddo5v7hceqmtzumivkq"
+essbase_listing_resource_version="21.6.0.0.1_240807"
+essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaaocztyhunwqpdbow2kxpi7xxdnyteq27wey5rcuskwwqb6fendzla"
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 // Random string to make things unique
@@ -316,16 +316,23 @@ module "upgrade" {
 
   sourceInstance_ocid = var.sourceInstance_ocid
   sourceInstance_extendedMetadata = var.sourceInstance_extendedMetadata
+  sourceInstance_version      = var.upgrade_backup_restore
 
   instanceImage_ocid = var.essbase_listing_resource_id
   instanceSpecifyPrivateIP = var.instanceSpecifyPrivateIP
   instancePrivateIP = var.instancePrivateIP
 
-  instanceBackupRestore = var.upgrade_backup_restore == "Essbase 21c - 21.3 or above" ? false: true
+  instanceBackupRestore = true
   instanceUpgrade19c34  = var.upgrade_backup_restore == "Essbase 19c - 19.3.0.3.4, 19.3.0.4.5" ? true: false
+  instanceUpgrade19c23  = var.upgrade_backup_restore == "Essbase 19c - 19.3.0.2.3" ? true: false
+  instanceUpgrade19c02  = var.upgrade_backup_restore == "Essbase 19c - 19.3.0.0.2" ? true: false
+  instanceUpgrade21c01  = var.upgrade_backup_restore == "Essbase 21c - 21.1" ? true: false
   instanceSchemaPrefix = local.rcu_schema_prefix
 
   instanceDBPassword = var.upgrade_db_credential
   instanceEssbasePassword = var.upgrade_essbase_credential
   instanceIDCSPassword = var.upgrade_IDCS_credential
+  instanceUpgradeShape = var.upgrade_target_instance_shape
+  bucket_name    = "essbase_${local.instance_uuid_short}_metadata"
+
 }
diff --git a/terraform/modules/bucket/main.tf b/terraform/modules/bucket/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 data "oci_objectstorage_namespace" "user" {

diff --git a/terraform/modules/bucket/outputs.tf b/terraform/modules/bucket/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "id" {

diff --git a/terraform/modules/bucket/variables.tf b/terraform/modules/bucket/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 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" {

diff --git a/terraform/modules/database/main.tf b/terraform/modules/database/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 resource "random_password" "bootstrap_password_1" {

diff --git a/terraform/modules/database/outputs.tf b/terraform/modules/database/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "database_id" {

diff --git a/terraform/modules/database/variables.tf b/terraform/modules/database/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 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" {

diff --git a/terraform/modules/essbase-node/main.tf b/terraform/modules/essbase-node/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #
@@ -27,7 +27,7 @@ runcmd:
 --boundary-0123456789--
 TMPL
 
-  is_flex_shape     = (var.shape == "VM.Standard.E3.Flex" || var.shape == "VM.Standard.E4.Flex") || (var.shape == "VM.Optimized3.Flex" || var.shape == "VM.Standard3.Flex")
+  is_flex_shape     = (var.shape == "VM.Standard.E3.Flex" || var.shape == "VM.Standard.E4.Flex") || (var.shape == "VM.Optimized3.Flex" || var.shape == "VM.Standard3.Flex") || var.shape == "VM.Standard.E5.Flex"
   flex_ocpus        = var.shape_ocpus == null ? 4 : var.shape_ocpus
   flex_shape_config = local.is_flex_shape ? [{ "ocpus" : local.flex_ocpus }] : []
 }

diff --git a/terraform/modules/essbase-node/outputs.tf b/terraform/modules/essbase-node/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "node_index" {

diff --git a/terraform/modules/essbase-node/variables.tf b/terraform/modules/essbase-node/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 variable "image_id" {

diff --git a/terraform/modules/essbase/main.tf b/terraform/modules/essbase/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 locals {

diff --git a/terraform/modules/essbase/outputs.tf b/terraform/modules/essbase/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "nodes" {

diff --git a/terraform/modules/essbase/variables.tf b/terraform/modules/essbase/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 variable "listing_id" {

diff --git a/terraform/modules/existing-database-oci/main.tf b/terraform/modules/existing-database-oci/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 data "oci_database_database" "database" {

diff --git a/terraform/modules/existing-database-oci/outputs.tf b/terraform/modules/existing-database-oci/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "database_id" {

diff --git a/terraform/modules/existing-database-oci/variables.tf b/terraform/modules/existing-database-oci/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 variable "database_id" {

diff --git a/terraform/modules/existing-database/main.tf b/terraform/modules/existing-database/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 data "oci_database_autonomous_database" "autonomous_database" {

diff --git a/terraform/modules/existing-database/outputs.tf b/terraform/modules/existing-database/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "database_id" {

diff --git a/terraform/modules/existing-database/variables.tf b/terraform/modules/existing-database/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 variable "database_id" {

diff --git a/terraform/modules/existing-network/main.tf b/terraform/modules/existing-network/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 data "oci_core_vcn" "vcn" {

diff --git a/terraform/modules/existing-network/outputs.tf b/terraform/modules/existing-network/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "vcn_id" {

diff --git a/terraform/modules/existing-network/variables.tf b/terraform/modules/existing-network/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 variable "existing_vcn_id" {

diff --git a/terraform/modules/idcs/variables.tf b/terraform/modules/idcs/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 variable "idcs_tenant" {

diff --git a/terraform/modules/load-balancer/main.tf b/terraform/modules/load-balancer/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 resource "oci_load_balancer" "loadbalancer" {

diff --git a/terraform/modules/load-balancer/outputs.tf b/terraform/modules/load-balancer/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 locals {

diff --git a/terraform/modules/load-balancer/variables.tf b/terraform/modules/load-balancer/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # OCI Service

diff --git a/terraform/modules/network/application-subnet.tf b/terraform/modules/network/application-subnet.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 resource "oci_core_security_list" "application" {

diff --git a/terraform/modules/network/load-balancer-subnet.tf b/terraform/modules/network/load-balancer-subnet.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 locals {

diff --git a/terraform/modules/network/main.tf b/terraform/modules/network/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 locals {

diff --git a/terraform/modules/network/outputs.tf b/terraform/modules/network/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "vcn_id" {

diff --git a/terraform/modules/network/storage-subnet.tf b/terraform/modules/network/storage-subnet.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2020, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 resource "oci_core_security_list" "storage" {

diff --git a/terraform/modules/network/variables.tf b/terraform/modules/network/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # OCI Service

diff --git a/terraform/modules/notification/main.tf b/terraform/modules/notification/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 data "oci_ons_notification_topic" "essbase_topic" {

diff --git a/terraform/modules/notification/outputs.tf b/terraform/modules/notification/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "topic_id" {

diff --git a/terraform/modules/notification/variables.tf b/terraform/modules/notification/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019 - 2023 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 variable "topic_id" {