diff --git a/quickstart.tfvars b/quickstart.tfvars index b1f4ce4..b6a11f2 100644 --- 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 index 18553e3..3a1f9d4 100644 --- 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 old mode 100755 new mode 100644 index b7a2f5a..f8b0540 --- 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 \ No newline at end of file +## 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 index 59bc8f1..c74e4ad 100644 --- 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 \ No newline at end of file +essbase_listing_resource_version="21.5.0.0.1_230623" +essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaayb5siifez66bpr3uh4vmv7mnxt2csus5uddo5v7hceqmtzumivkq" \ No newline at end of file diff --git a/terraform/main.tf b/terraform/main.tf index 6569a8c..79bc0ad 100644 --- 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 index 6b0a4da..26cad18 100644 --- 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 index bd0adf1..82dd039 100644 --- 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 index d6a91f0..9bd0ffb 100644 --- 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 index 9be057b..769570e 100644 --- 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 index e8c020b..30441ab 100644 --- 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 index a6962ed..ee9100a 100644 --- 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 index 7b05123..a70629c 100644 --- 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 index 05ab0ff..912b41d 100644 --- 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 index bf2e528..b1ab5e3 100644 --- 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 index f7a8bd6..a9716e1 100644 --- 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 index 74b8e97..cbdba30 100644 --- 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 index 65a2696..b8448ab 100644 --- 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 index aa7b0fa..39ec8f9 100644 --- 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 index d37d56a..88a9a06 100644 --- 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 index b787b9f..5a39f44 100644 --- 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 index 5e8afcb..13a39f1 100644 --- 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 index 6407383..6ab5fa0 100644 --- 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 index e8be709..20951bc 100644 --- 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 index 7c284b3..fe036ea 100644 --- 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 index 129928f..fe39323 100644 --- 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 index 7dfb9f3..c96c079 100644 --- 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 index 03442a4..5f03238 100644 --- 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 index 1c47dbb..2fd43ce 100644 --- 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 index 6a53672..d09b2b4 100644 --- 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 index bdd04d8..59245df 100644 --- 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 index 2545f7d..69e3710 100644 --- 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 index 55512d0..1cd56ab 100644 --- 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 index 3632352..9626489 100644 --- 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 index c33b4eb..1e930f8 100644 --- 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 index ca46239..24fef0e 100644 --- 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 index 2824fa5..49f26d8 100644 --- 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 index 9b121c2..ff8b049 100644 --- 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 index 7b14c3c..79ec596 100644 --- 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 index 42bf5f0..d9438ef 100644 --- 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 index f6bb03e..cf1d85a 100644 --- 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 index 3eb8bab..32ec252 100644 --- 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 index 999831e..b0fa400 100644 --- 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 index f6309c0..eb615f6 100644 --- 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" { diff --git a/terraform/schema.yaml b/terraform/schema.yaml index b3f78de..1431058 100644 --- a/terraform/schema.yaml +++ b/terraform/schema.yaml @@ -53,6 +53,7 @@ groupings: - ${essbase_admin_password_id} - ${instance_timezone} - ${instance_catalog_storage} + - ${instance_smv_server} - ${enable_embedded_proxy} - ${region} - ${localAD} @@ -181,7 +182,7 @@ variables: - ${is_upgrade} is_upgrade: - title: Image Update + title: Upgrade Stack description: Create a new node based on existing deployment, using new image. type: boolean default: false @@ -937,7 +938,17 @@ variables: required: false visible: not: - - ${is_upgrade} + - ${is_upgrade} + + instance_smv_server: + title: "Deploy Smart View Server (Preview)" + description: "Check to configure Oracle Smart View server. Oracle Smart View for Office (Mac and Browser) for Essbase is in Preview status." + type: boolean + default: false + required: false + visible: + not: + - ${is_upgrade} ssh_authorized_keys: title: SSH Public Key diff --git a/terraform/terraform.tfvars.template b/terraform/terraform.tfvars.template index f1ff841..bfa008d 100644 --- a/terraform/terraform.tfvars.template +++ b/terraform/terraform.tfvars.template @@ -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 Authentication details diff --git a/terraform/variables.tf b/terraform/variables.tf index 6f46819..c6c1863 100644 --- a/terraform/variables.tf +++ b/terraform/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. // General settings @@ -204,6 +204,12 @@ variable "instance_catalog_storage" { default = "" } +variable "instance_smv_server" { + type = bool + default = false +} + + variable "data_volume_size" { // (gigabytes) type = number diff --git a/terraform/versions.tf b/terraform/versions.tf index eaf18f9..dc3f977 100644 --- a/terraform/versions.tf +++ b/terraform/versions.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. terraform {