Development (#181)

Merge development branch to main to cut release branch.

---------

Co-authored-by: Roberto Sanchez <[email protected]>
Co-authored-by: Mahuwa Barman <[email protected]>
Co-authored-by: telake <[email protected]>
Co-authored-by: Rajesh Chavan <[email protected]>
Co-authored-by: abhijit-paranjpe <[email protected]>

Author: 6 people

README.md

@@ -42,6 +42,13 @@ For pre-requisites specific to Terraform CLI and ORM, see their corresponding se
 
 ## Create the Stack Using the OCI Marketplace
 
+The WebLogic Server for OCI stack applications available in the Marketplace are:
+- [Oracle WebLogic Server Enterprise Edition (UCM)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/72493372)
+- [Oracle WebLogic Suite (UCM)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/72492657)
+- [Oracle WebLogic Server Standard Edition (BYOL)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/65022652)
+- [Oracle WebLogic Server Enterprise Edition (BYOL)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/63497374)
+- [Oracle WebLogic Suite (BYOL)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/63498586)
+
 To create, manage and destroy the OCI Terraform stack for WebLogic Server as WebLogic Server for OCI using the Marketplace,
 follow the instructions in the [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/create-stack1.html).
 

VARIABLES.md

@@ -203,7 +203,17 @@ Review the [observability_variables.tf](./terraform/observability_variables.tf)
 To configure the stack to automatically add or remove servers based on performance metrics, refer to the
 [autoscaling_variables.tf](./terraform/autoscaling_variables.tf) file for the variables to use.
 
-Note that autoscaling is not supported when creating a stack using Terraform CLI. You need you create a [Resource Manager][orm]
+This is an example of how to configure autoscaling:
+```terraform
+use_autoscaling       = true
+wls_metric            = "CPU Load"
+min_threshold_percent = 10
+max_threshold_percent = 20
+ocir_user             = "<ocir_user>"
+ocir_auth_token_id    = "ocid1.vaultsecret.oc1.phx.xxxxxxxxxxxxxxx"
+```
+There are some prerequisites for using autoscaling. See [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/components-oracle-weblogic-cloud.html#GUID-CE8B9AE0-0FE9-442A-9239-8B0DFD835119) for more details.                                 
+Note that autoscaling is not supported when creating a stack using Terraform CLI. You need to create a [Resource Manager][orm]
 stack, or use the [Marketplace][marketplace].
 
 [marketplace]: https://docs.oracle.com/iaas/Content/Marketplace/Concepts/marketoverview.htm

solutions/jrf/README.md

@@ -47,7 +47,7 @@ The directory oci-weblogic-server/solutions/jrf consists of the following terraf
 The directory oci-weblogic-server/solutions/common consists of the following:
 - tenancy.tfvars - tenancy configuration
 
-The files in the oci-weblogic-server/inputs directory contain the values of the images for the different combinations of
+The files in the oci-weblogic-server/images directory contain the values of the images for the different combinations of
 WebLogic edition and pricing. In this solution, the file _mp_image_ee_byol.tfvars_ is used to create a WebLogic Enterprise
 Edition, BYOL instance. Specify a different file to use a different edition and/or pricing. 
 
@@ -63,7 +63,8 @@ Initialize the terraform provider plugin
 terraform init
 ```
 
-Update the variable values in tfvars files under directories terraform/solutions/common and terraform/solutions/jrf according to the user specific values
+Update the variable values in tfvars files under directories terraform/solutions/common and terraform/solutions/jrf according
+to the user specific values.
 Invoke apply passing all *.tfvars files as input
 ```bash
 terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars

solutions/non_jrf/README.md

@@ -42,7 +42,7 @@ The directory oci-weblogic-server/solutions/non_jrf consists of the following te
 The directory oci-weblogic-server/solutions/common consists of the following:
 - tenancy.tfvars - tenancy configuration
 
-The files in the oci-weblogic-server/inputs directory contain the values of the images for the different combinations of
+The files in the oci-weblogic-server/images directory contain the values of the images for the different combinations of
 WebLogic edition and pricing. In this solution, the file _mp_image_ee_byol.tfvars_ is used to create a WebLogic Enterprise
 Edition, BYOL instance. Specify a different file to use a different edition and/or pricing.
 

terraform/bastion_variables.tf

@@ -33,7 +33,7 @@ variable "bastion_instance_shape" {
 
 variable "bastion_ssh_private_key" {
   type        = string
-  description = "Private ssh key for existing bastion instance"
+  description = "The path to the file that contains the private ssh key for an existing bastion instance"
   default     = ""
 }
 

terraform/images/mp_image_ee_byol.tfvars

@@ -1,12 +1,12 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.1.1-230118062825"
+tf_script_version        = "23.1.3-230323195128"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaxr2dllkm3e6qwdleu6q3bwou6pw2r2vt4ne7d7aucrtxpurypvyq"
+listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaadgqvwsbfcm6bjaowtogdym4kv5gffi6rwv3d5po2o4vk2smwwcxa"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaagrmncsysh64fj5hh5pcjr6swo6oyzzbh4woi4q4hsyct6n5eqkuq"
+ucm_listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaagmy46blg6wrvwvozvnui25jxaus5jt6fquv2efkktcf2p6vnveiq"

terraform/images/mp_image_ee_ucm.tfvars

@@ -1,8 +1,8 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.1.1-230118062825"
+tf_script_version        = "23.1.3-230323195128"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaagrmncsysh64fj5hh5pcjr6swo6oyzzbh4woi4q4hsyct6n5eqkuq"
+listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaagmy46blg6wrvwvozvnui25jxaus5jt6fquv2efkktcf2p6vnveiq"

terraform/images/mp_image_suite_byol.tfvars

@@ -1,12 +1,12 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.1.1-230118062825"
+tf_script_version        = "23.1.3-230323195128"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaazc4flvws6yji6ktj6jwzhrm6e6dcvf2vwiokovrlwodvppa5atfa"
+listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaar3qjebqyaqpqwqzeg2mtf2gt4oosly23qaeb4k76fzhprnphnuxa"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaapqar667d3clrw6xgpoccbtqj6rff5xcpj72sstttzqrahvvcx4ia"
+ucm_listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaxrntnjc2btd7o3rig3wpqkyskair2iospvquto2ofjt2tmuuujya"

terraform/images/mp_image_suite_ucm.tfvars

@@ -1,8 +1,8 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.1.1-230118062825"
+tf_script_version        = "23.1.3-230323195128"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaapqar667d3clrw6xgpoccbtqj6rff5xcpj72sstttzqrahvvcx4ia"
+listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaxrntnjc2btd7o3rig3wpqkyskair2iospvquto2ofjt2tmuuujya"

terraform/locals.tf

@@ -148,7 +148,7 @@ locals {
     var.wls_extern_ssl_admin_port,
   ) : ""
 
-  use_apm_service = (var.use_apm_service || var.use_autoscaling)
+  use_apm_service           = (var.use_apm_service || var.use_autoscaling)
   apm_domain_compartment_id = local.use_apm_service ? lookup(data.oci_apm_apm_domain.apm_domain[0], "compartment_id") : ""