Release 21.5.0.0.1 (#68)

* 215001 changes * udpated the quickstart.tfvars file with 21.5.0.0.1 changes * remove template version. cannot update
oracle-quickstart · Sep 20, 2023 · 49550a6 · 49550a6
1 parent cb0cb18
commit 49550a6
Show file tree

Hide file tree

Showing 47 changed files with 99 additions and 64 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.4.0.0.1_2209301529"
-essbase_listing_resource_id      = "ocid1.image.oc1..aaaaaaaayqzkbfw6byytpgmmp5s2kv64ipqa5gkxyhc23tuqptalqipsjkpq"
+essbase_listing_resource_version = "21.5.0.0.1_230623"
+essbase_listing_resource_id      = "ocid1.image.oc1..aaaaaaaatbmet5aq76qywqzhgxyqbka3nj5dze3gbcr6ll43fgkl33klzw2q"
 
 tenancy_ocid 					= "" 		                # REPLACE
 
@@ -47,6 +47,12 @@ sourceInstance_ocid             = ""
 sourceInstance_extendedMetadata = <<-EOF
 
 EOF
-# In case of instances which are running Essbase version prior to 19.3.0.5.6, please run the upgrade-metadata-19c.sh to prepare for upgrade, and collect the extended metadata as shown below.                                                  
+
+# In case of instances which are running Essbase version prior to 19.3.0.5.6, please run the appropriate upgrade metadata script to prepare for upgrade, and collect the extended metadata as shown below.                                                  
 # REPLACE LINE 48 WITH EXTENDED METADATA WITH COMMAND OUTPUT FROM SOURCE INSTANCE:
 # oci compute instance get --instance-id $(oci-metadata -j | jq -r '.instance.id') --auth instance_principal | jq '.data."extended-metadata"'
+
+# Optional fields to override in case of change in original credentials
+upgrade_db_credential           = ""
+upgrade_essbase_credential      = ""
+upgrade_IDCS_credential         = ""
diff --git a/terraform/LICENSE b/terraform/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019-2023 Oracle and/or its affiliates. 
+Copyright (c) 2019, 2021 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,10 +1,7 @@
-## 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 for Bring Your Own License.
-
-essbase_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaqyxur5zacfln6epkbm46sdu5whf6zepbm43b63rm44d5hnm2ft5a"
-essbase_listing_resource_version = "21.4.3.0.1_230407"
-essbase_listing_resource_id      = "ocid1.image.oc1..aaaaaaaagyz5doydjidcvj564obam5v4nslefpikgubqivyche5qc7kvuufa"
-
-# Check quickstart.tfvars for example usage / instructions
+## 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.
+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"
diff --git a/terraform/essbase.auto.tfvars.ucm b/terraform/essbase.auto.tfvars.ucm
@@ -1,10 +1,8 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## 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.
 # 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.4.3.0.1_230407"
-essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaavomtkpulouvfcl6rl6w7wrdd2av5awsazvoa3sycs6z3om7sygmq"
-
-# Check quickstart.tfvars for example usage / instructions
+essbase_listing_resource_version="21.5.0.0.1_230623"
+essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaayb5siifez66bpr3uh4vmv7mnxt2csus5uddo5v7hceqmtzumivkq"
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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
@@ -24,6 +24,7 @@ locals {
 
   instance_count = var.enable_cluster ? var.instance_count : 1
   instance_catalog_storage = var.instance_catalog_storage
+  instance_smv_server = var.instance_smv_server
 
   create_load_balancer = var.enable_cluster || var.create_load_balancer
 
@@ -266,7 +267,7 @@ module "essbase" {
   catalog_bucket  = (length(module.catalog-bucket) > 0) ? module.catalog-bucket[0] : null
 
   instance_catalog_storage = var.instance_catalog_storage
-
+  instance_smv_server = local.instance_smv_server
   additional_host_mappings = lookup(local.db_type_host_mappings, local.db_type, [])
 
   identity_provider = var.identity_provider

diff --git a/terraform/modules/bucket/main.tf b/terraform/modules/bucket/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #
@@ -95,6 +95,7 @@ resource "oci_core_instance" "essbase" {
 
     catalog_bucket  = jsonencode(var.catalog_bucket)
     catalog_storage = jsonencode(var.instance_catalog_storage)
+    smv_server      = jsonencode(tostring(var.instance_smv_server))
 
     volumes = jsonencode({
       config = {

diff --git a/terraform/modules/essbase-node/outputs.tf b/terraform/modules/essbase-node/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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" {
@@ -218,6 +218,11 @@ variable "instance_catalog_storage" {
   default = ""
 }
 
+variable "instance_smv_server" {
+  type    = bool
+  default = false
+}
+
 variable "metadata_bucket" {
   type = object({
     id        = string

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

diff --git a/terraform/modules/essbase/outputs.tf b/terraform/modules/essbase/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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" {
@@ -86,6 +86,11 @@ variable "instance_catalog_storage" {
   default = ""
 }
 
+variable "instance_smv_server" {
+  type    = bool
+  default = false
+}
+
 variable "hostname_label_prefix" {
   description = "The hostname for the essbase node"
   type        = string

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

diff --git a/terraform/modules/upgrade/main.tf b/terraform/modules/upgrade/main.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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/upgrade/outputs.tf b/terraform/modules/upgrade/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 

diff --git a/terraform/modules/upgrade/variables.tf b/terraform/modules/upgrade/variables.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, 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/outputs.tf b/terraform/outputs.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "stack_version" {
@@ -77,6 +77,10 @@ output "metadata_bucket_name" {
   value = var.is_upgrade? module.upgrade[0].metadata_bucket_name:  module.metadata-bucket[0].name
 }
 
+output "instance_smv_server" {
+  value = var.is_upgrade? null: var.instance_smv_server
+}
+
 output "z_messages" {
   value = "\n\n*********************\nOracle Essbase stack has been provisioned and is continuing configuration in the background.\nIt may take up to 20 minutes for configuration to complete.\nLog details can be found on the target nodes at /var/log/essbase-init.log.\n*********************\n"
 }
diff --git a/terraform/provider.tf b/terraform/provider.tf
@@ -1,4 +1,4 @@
-## Copyright (c) 2019-2023 Oracle and/or its affiliates.
+## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 variable "tenancy_ocid" {