Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main branch of fork to oci-essbase quickstart main #70

Merged
merged 3 commits into from
Jan 24, 2025
Merged

Merge main branch of fork to oci-essbase quickstart main #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05e8557
changes for 216 draft
sankara911 Aug 22, 2024
ccb80f5
the provider version not available. removing it
sankara911 Aug 22, 2024
53b740a
Merge branch 'sankara911-snh_release_216'
sankara911 Jan 17, 2025
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 quickstart.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion terraform/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions terraform/essbase.auto.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions terraform/essbase.auto.tfvars.ucm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
11 changes: 9 additions & 2 deletions terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"

}
2 changes: 1 addition & 1 deletion terraform/modules/bucket/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/bucket/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/bucket/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/database/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/database/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/database/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
4 changes: 2 additions & 2 deletions terraform/modules/essbase-node/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

#
Expand Down Expand Up @@ -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 }] : []
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/essbase-node/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/essbase-node/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/essbase/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/essbase/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/essbase/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/existing-database-oci/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/existing-database-oci/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/existing-database-oci/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/existing-database/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/existing-database/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/existing-database/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/existing-network/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/existing-network/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/existing-network/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/idcs/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/load-balancer/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/load-balancer/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/load-balancer/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/network/application-subnet.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/network/load-balancer-subnet.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/network/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/network/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/network/storage-subnet.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/network/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/notification/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/notification/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/notification/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
Loading