Skip to content

Commit 49550a6

Browse files
authored
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
1 parent cb0cb18 commit 49550a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+99
-64
lines changed

quickstart.tfvars

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# Run "terraform apply" to apply plan and create stack.
66

77
essbase_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaqyxur5zacfln6epkbm46sdu5whf6zepbm43b63rm44d5hnm2ft5a"
8-
essbase_listing_resource_version = "21.4.0.0.1_2209301529"
9-
essbase_listing_resource_id = "ocid1.image.oc1..aaaaaaaayqzkbfw6byytpgmmp5s2kv64ipqa5gkxyhc23tuqptalqipsjkpq"
8+
essbase_listing_resource_version = "21.5.0.0.1_230623"
9+
essbase_listing_resource_id = "ocid1.image.oc1..aaaaaaaatbmet5aq76qywqzhgxyqbka3nj5dze3gbcr6ll43fgkl33klzw2q"
1010

1111
tenancy_ocid = "" # REPLACE
1212

@@ -47,6 +47,12 @@ sourceInstance_ocid = ""
4747
sourceInstance_extendedMetadata = <<-EOF
4848
4949
EOF
50-
# 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.
50+
51+
# 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.
5152
# REPLACE LINE 48 WITH EXTENDED METADATA WITH COMMAND OUTPUT FROM SOURCE INSTANCE:
5253
# oci compute instance get --instance-id $(oci-metadata -j | jq -r '.instance.id') --auth instance_principal | jq '.data."extended-metadata"'
54+
55+
# Optional fields to override in case of change in original credentials
56+
upgrade_db_credential = ""
57+
upgrade_essbase_credential = ""
58+
upgrade_IDCS_credential = ""

terraform/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2019-2023 Oracle and/or its affiliates.
1+
Copyright (c) 2019, 2021 Oracle and/or its affiliates.
22

33
The Universal Permissive License (UPL), Version 1.0
44

terraform/essbase.auto.tfvars

100755100644
Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
## Copyright (c) 2019-2023, Oracle and/or its affiliates.
2-
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
3-
4-
# Listing details for the Essbase custom image for Bring Your Own License.
5-
6-
essbase_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaqyxur5zacfln6epkbm46sdu5whf6zepbm43b63rm44d5hnm2ft5a"
7-
essbase_listing_resource_version = "21.4.3.0.1_230407"
8-
essbase_listing_resource_id = "ocid1.image.oc1..aaaaaaaagyz5doydjidcvj564obam5v4nslefpikgubqivyche5qc7kvuufa"
9-
10-
# Check quickstart.tfvars for example usage / instructions
1+
## Copyright (c) 2019, 2021, 2022 Oracle and/or its affiliates.
2+
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
# Listing details for the Essbase custom image for Bring Your Own License.
5+
essbase_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaqyxur5zacfln6epkbm46sdu5whf6zepbm43b63rm44d5hnm2ft5a"
6+
essbase_listing_resource_version = "21.5.0.0.1_230623"
7+
essbase_listing_resource_id = "ocid1.image.oc1..aaaaaaaatbmet5aq76qywqzhgxyqbka3nj5dze3gbcr6ll43fgkl33klzw2q"

terraform/essbase.auto.tfvars.ucm

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
## Copyright (c) 2019-2023 Oracle and/or its affiliates.
1+
## Copyright (c) 2019, 2021, 2022 Oracle and/or its affiliates.
22
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
# Listing details for the Essbase custom image.
55
# The resource_id values here should match the build script and oci_images.tf
66
essbase_listing_id="ocid1.appcataloglisting.oc1..aaaaaaaanstxnoz6uttexhw5jfpqhu4gkwsp2ebmw4i2p7gkq65sr3e7z4gq"
7-
essbase_listing_resource_version="21.4.3.0.1_230407"
8-
essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaavomtkpulouvfcl6rl6w7wrdd2av5awsazvoa3sycs6z3om7sygmq"
9-
10-
# Check quickstart.tfvars for example usage / instructions
7+
essbase_listing_resource_version="21.5.0.0.1_230623"
8+
essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaayb5siifez66bpr3uh4vmv7mnxt2csus5uddo5v7hceqmtzumivkq"

terraform/main.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright (c) 2019-2023 Oracle and/or its affiliates.
1+
## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
22
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
// Random string to make things unique
@@ -24,6 +24,7 @@ locals {
2424

2525
instance_count = var.enable_cluster ? var.instance_count : 1
2626
instance_catalog_storage = var.instance_catalog_storage
27+
instance_smv_server = var.instance_smv_server
2728

2829
create_load_balancer = var.enable_cluster || var.create_load_balancer
2930

@@ -266,7 +267,7 @@ module "essbase" {
266267
catalog_bucket = (length(module.catalog-bucket) > 0) ? module.catalog-bucket[0] : null
267268

268269
instance_catalog_storage = var.instance_catalog_storage
269-
270+
instance_smv_server = local.instance_smv_server
270271
additional_host_mappings = lookup(local.db_type_host_mappings, local.db_type, [])
271272

272273
identity_provider = var.identity_provider

terraform/modules/bucket/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright (c) 2019-2023 Oracle and/or its affiliates.
1+
## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
22
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
data "oci_objectstorage_namespace" "user" {

terraform/modules/bucket/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright (c) 2019-2023 Oracle and/or its affiliates.
1+
## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
22
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
output "id" {

terraform/modules/bucket/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright (c) 2019-2023 Oracle and/or its affiliates.
1+
## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
22
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
variable "compartment_id" {

terraform/modules/database/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright (c) 2019-2023 Oracle and/or its affiliates.
1+
## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
22
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
resource "random_password" "bootstrap_password_1" {

terraform/modules/database/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright (c) 2019-2023 Oracle and/or its affiliates.
1+
## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
22
## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
output "database_id" {

0 commit comments

Comments
 (0)