Merge pull request #61 from sankara911/snh_213_publish

Publish changes to repo to make it 21.3.0.0.1 ready

Author: thomjakub

.github/workflows/build-essbase-stack-release.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: hashicorp/setup-terraform@v1
       with:
-        terraform_version: ~0.14.0
+        terraform_version: ~1.0
     - name: Terraform Init
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-essbase-stack.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: hashicorp/setup-terraform@v1
       with:
-        terraform_version: ~0.14.0
+        terraform_version: ~1.0
     - name: Terraform Init
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [21.3.0.0.1]
+
+### Changed
+- Remove creation of bastion. Customers are encouraged to use the OCI Bastion service for accessing their environment.
+- Support for Terraform 1.0
+
+### Image Details
+
+- [Oracle-Linux-7.9-2021.08.27-0](https://docs.oracle.com/en-us/iaas/images/image/33995e8a-13e8-4ebe-8a27-8beae9e57043/)
+- Oracle Fusion Middleware 12.2.1.4.0 GA
+- Oracle Essbase 21.1.0.0.0 GA
+- Oracle JDK 8 update 291 Server JRE
+- Applied patches:
+  - 33455144 - WebLogic Stack Patch Bundle 12.2.1.4.211011
+  -	28186730 - OPatch 13.9.4.2.7 for FMW/WLS 12.2.1.3.0 and 12.2.1.4.0
+  -	33416868 - WLS Patch Set Update 12.2.1.4.210930
+  -	33286160 - Coherence 12.2.1.4 Cumulative Patch 11 (12.2.1.4.11)
+  -	32148640 - WebLogic Samples SPU 12.2.1.4.210119
+  -	31544353 - ADR for WebLogic Server 12.2.1.4.0
+  -	32772437 - FMW platform 12.2.1.4.0 SPU Patch
+  -	31676526 - RCU Patches for ADB
+  -	30540494 - RCU Patches for ADB
+  -	30754186 - RCU Patches for ADB
+  -	32784652 - OPSS Bundle Patch 12.2.1.4.210418
+  -	33313802 - ADF Bundle Patch 12.2.1.4.210903
+  -	32646479 - Essbase Release Update 21.3.0.0.0
+  -	33671996 - WebLogic overlay patch for October 2021 PSU for CVE-2021-44228 and CVE-2021-45046
+
 ## [21.2.0.0.1]
 
 ### Changed

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2021 Oracle and/or its affiliates.  All rights reserved.
+Copyright (c) 2019-2022 Oracle and/or its affiliates.  All rights reserved.
 
 The Universal Permissive License (UPL), Version 1.0
 

README.md

@@ -26,7 +26,7 @@ The above digram shows the default topology supported by the terraform scripts.
 
 ![Full Topology Diagram](./images/image-full_topology.png)
 
-The above digram shows the full topology supported by the terraform scripts.  In this scenario, the application subnet is private. To access the Essbase user interface, an OCI load balancer is provisioned in either public or private regional subnet.  A bastion host (optional) is provisioned to allow access through a public ip address.
+The above diagram shows the full topology supported by the terraform scripts.  In this scenario, the application subnet is private. To access the Essbase user interface, an OCI load balancer is provisioned in either public or private regional subnet.  An OCI Bastion Service instance can be used from OCI to allow access through a public ip address.
 
 ## Before You Begin with Oracle Essbase
 
@@ -43,6 +43,7 @@ You create dynamic groups of Oracle Cloud Infrastructure compute instances, and
 ### Setup Policies
 
 Set up policies that are appropriate for your organization's security setup. The following is an example of a policy template, with each row being a policy statement.
+Please refer to the 21c Oracle documentation for the up-to-date list.
 
 ```
 allow group group_name to manage virtual-network-family in compartment compartment_name

VARIABLES.md

@@ -33,13 +33,11 @@
 | use_existing_vcn | N | false | Select this option to support deployment of Essbase components into an existing virtual cloud network (VCN). |
 | existing_vcn_id | if `use_existing_vcn=true` | | An existing VCN in which to create the compute resources. |
 | existing_application_subnet_id | if `use_existing_vcn=true` | | An existing subnet for the target Essbase instance. |
-| existing_bastion_subnet_id | if `use_existing_vcn=true` | | An existing subnet for creating the bastion host |
 | existing_load_balancer_subnet_id | if `use_existing_vcn=true` | | An existing subnet to use for the load balancer. |
 | existing_load_balancer_subnet_id_2 | if `use_existing_vcn=true` | | An existing subnet to use for the second load balancer node. This field is required only if you are not using regional subnets. |
 | vcn_cidr | N | 10.0.0.0/16 | The CIDR to assign to the new virtual cloud network (VCN) to create for this service. |
 | vcn_dns_label | N | | The DNS label to assign to the VCN. If not provided, the value will be randomly generated. |
 | application_subnet_cidr | N | 10.0.1.0/24 | The CIDR to assign to the subnet for the target Essbase compute node. This will be created as a regional subnet. |
-| bastion_subnet_cidr | N | 10.0.3.0/24 | The CIDR to assign to the subnet for the bastion host. This will be created as a regional subnet. |
 | load_balancer_subnet_cidr | N | 10.0.4.0/24 | The CIDR to assign to the subnet for the load balancer.  This will be created as regional subnet. |
 
 ## Load Balancer Details
@@ -49,13 +47,6 @@
 | create_public_load_balancer | N | true | Provision the load balancer with a public IP address. |
 | load_balancer_shape | N | 100Mbps | Select which load balancer shape. |
 
-## Bastion Details
-| Name | Required | Default | Description |
-| ---- | -------- | ------- | ----------- |
-| create_bastion | N | false | Create a bastion host. |
-| bastion_instance_shape | if `create_bastion=true` | VM.Standard.E2.1 | The shape for the bastion compute instance. |
-| bastion_availability_domain | if `create_bastion=true` | | The target availability domain for the bastion. |
-
 ## Essbase instance details
 | Name | Required | Default | Description |
 | ---- | -------- | ------- | ----------- |

images/00_clone_repo.png

@@ -0,0 +1,39 @@
+# Please refer to essbase.auto.tfvars.template for complete variables list and help.
+# This is a minimum requirement of variable details for quickstart. Not recommended for production.
+# Replace with your values and replace as essbase.auto.tfvars in terraform working directory. 
+# Run "terraform plan" to validate and correct errors if any.
+# Run "terraform apply" to apply plan and create stack.
+
+essbase_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaqyxur5zacfln6epkbm46sdu5whf6zepbm43b63rm44d5hnm2ft5a"
+essbase_listing_resource_version = "21.3.0.0.2-2201181909"
+essbase_listing_resource_id      = "ocid1.image.oc1..aaaaaaaawwjojlc5vned6bvhwynlrinljdp243lhsfjs6j34nrs2mbmza4qq"
+
+tenancy_ocid 					= ""                                     # REPLACE
+
+user_ocid 						= ""                                     # REPLACE
+fingerprint						= ""                                     # REPLACE
+private_key_path 				= ""                                     # REPLACE
+region 							= "us-ashburn-1"                         # REPLACE
+compartment_ocid 				= ""                                     # REPLACE
+stack_display_name 				= ""                                     # REPLACE
+
+use_existing_vcn 				= "false"
+vcn_cidr 						= "10.0.0.0/16"
+
+create_load_balancer 			= "false"
+
+instance_shape 					= "VM.Standard2.4"
+instance_availability_domain 	= "KmGu:US-ASHBURN-AD-1"                 # REPLACE
+ssh_authorized_keys 			= ""                                     # REPLACE
+
+essbase_admin_username 			= "admin"
+essbase_admin_password_id 		= ""                                     # REPLACE
+
+create_public_essbase_instance  = "true"
+
+identity_provider 				= "embedded"
+
+use_existing_db					= "false"
+db_admin_password_id 			= ""                                     # REPLACE
+db_license_model 				= "BRING_YOUR_OWN_LICENSE"
+

images/01_terraform_init.png

@@ -1,4 +1,4 @@
-Copyright (c) 2019, 2021 Oracle and/or its affiliates. 
+Copyright (c) 2019-2022 Oracle and/or its affiliates. 
 
 The Universal Permissive License (UPL), Version 1.0
 

images/02_terraform_plan.png

@@ -1,7 +1,10 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019-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.2.0.0.1-2105122046"
-essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaabsrf5avedzseem2rljvzlroi24ad4gbbfucz35ncibtq6dg7xuaa"
+essbase_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaqyxur5zacfln6epkbm46sdu5whf6zepbm43b63rm44d5hnm2ft5a"
+essbase_listing_resource_version = "21.3.0.0.2-2201181909"
+essbase_listing_resource_id      = "ocid1.image.oc1..aaaaaaaawwjojlc5vned6bvhwynlrinljdp243lhsfjs6j34nrs2mbmza4qq"
+
+
+

images/03_terraform_apply.png

@@ -1,8 +1,8 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019-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.2.0.0.1-2105122046"
-essbase_listing_resource_id="ocid1.image.oc1..aaaaaaaazakzfglpraj7iir4n43er6zswlkcua7lwxgk4tjalivehxfyiofq"
+essbase_listing_id				  =  "ocid1.appcataloglisting.oc1..aaaaaaaanstxnoz6uttexhw5jfpqhu4gkwsp2ebmw4i2p7gkq65sr3e7z4gq"
+essbase_listing_resource_version  =  "21.3.0.0.2-2201181909"
+essbase_listing_resource_id       =  "ocid1.image.oc1..aaaaaaaa5xehuiwb6gtr6gos724b7yvvlmitgmlvbvo2z4lcrdfjczbmz6ua"

images/04_access_essbase.png

@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019-2022 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
@@ -25,8 +25,7 @@ locals {
   instance_count = var.enable_cluster ? var.instance_count : 1
 
   create_load_balancer = var.enable_cluster || var.create_load_balancer
-  create_bastion       = !var.create_public_essbase_instance && var.create_bastion
-
+  
   db_type_map = {
     "Autonomous Database" = "adb"
     "Database System"     = "oci"
@@ -113,9 +112,6 @@ module "network" {
   create_load_balancer_subnet = local.create_load_balancer
   create_private_load_balancer_subnet = !var.create_public_load_balancer
 
-  bastion_subnet_cidr_block = var.bastion_subnet_cidr
-  create_bastion_subnet = local.create_bastion
-
   freeform_tags       = local.freeform_tags
   defined_tags        = local.defined_tags
 }
@@ -130,29 +126,10 @@ module "existing-network" {
   existing_vcn_id = var.existing_vcn_id
   existing_application_subnet_id = var.existing_application_subnet_id
   existing_storage_subnet_id = local.enable_storage_vnic ? var.existing_storage_subnet_id : ""
-  existing_bastion_subnet_id = var.existing_bastion_subnet_id
+  #existing_bastion_subnet_id = var.existing_bastion_subnet_id
   existing_load_balancer_subnet_ids = local.create_load_balancer ? compact([ var.existing_load_balancer_subnet_id, var.existing_load_balancer_subnet_id_2 ]) : []
 }
 
-
-module "bastion" {
-  source = "./modules/bastion"
-
-  count                    = local.create_bastion ? 1 : 0
-  compartment_id           = data.oci_identity_compartment.compartment.id
-  availability_domain      = var.bastion_availability_domain != "" ? var.bastion_availability_domain : var.instance_availability_domain
-  subnet_id                = join("", compact(concat(module.existing-network.*.bastion_subnet_id, module.network.*.bastion_subnet_id)))
-  ssh_authorized_keys      = var.ssh_authorized_keys
-  display_name_prefix      = local.resource_name_prefix
-  freeform_tags            = local.freeform_tags
-  defined_tags             = local.defined_tags
-  instance_shape           = var.bastion_instance_shape
-  listing_id               = var.bastion_listing_id
-  listing_resource_version = var.bastion_listing_resource_version
-  listing_resource_id      = var.bastion_listing_resource_id
-  notification_topic_id    = var.notification_topic_id
-}
-
 module "database" {
   source = "./modules/database"
 

images/05_terraform_destroy.png

@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019-2022 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" {

images/image-full_topology.png

@@ -1,4 +1,4 @@
-## Copyright (c) 2019, 2021, Oracle and/or its affiliates.
+## Copyright (c) 2019-2022 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 output "id" {