Merge branch 'development' into main

skommala · skommala · commit 2515cf2c1b40 · 2024-03-05T12:37:18.000-08:00
diff --git a/terraform/images/mp_image_ee_byol.tfvars b/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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaagthrvz4ul6c5quok25hd2wtmsvyqx3preitjb63e7dxgopsez4aq"
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaahermck4j7yc3jbfcfzfpvwgzhfoen74mmn5dwrmnptep5ikb43va"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa4znas6youb5d3fwzxttrse22zhdfp7bc4kgqw5ecj2b4zzvmg53q"
+ucm_listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaev4aso265wkxmt566hvey4pgja4r2rd5yqnua37hcn5bo75lc77a"
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa4znas6youb5d3fwzxttrse22zhdfp7bc4kgqw5ecj2b4zzvmg53q"
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaev4aso265wkxmt566hvey4pgja4r2rd5yqnua37hcn5bo75lc77a"
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaatl3dybgmy6l3wqyaxprl22rvctqnkn5uixjsmfc2rbpian35pvjq"
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaax3lnppqmdleamgvqnt2zg4zgze7cmrkjmx4pwnw2s55utmvaieta"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
@@ -1,12 +1,13 @@
 # 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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaczn55djd6qih54sxpsn5ve7yloahczmnb7w2d7gadaagu6d44kwa"
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaalakd5qdicfbwnqljsgw4bwdqhl74nrz2t7mmnavcij5ifcpbm4nq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaai42ahqg2nzta7x5632b7vo5dwy5mf4gnxyu5qgqpaecatfsoq74a"
+ucm_listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaajf5s77j3syb42vtljjsyrnix2ycc6zdaychdaqa7gbncw5ajmelq"
+>>>>>>> development
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaai42ahqg2nzta7x5632b7vo5dwy5mf4gnxyu5qgqpaecatfsoq74a"
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaajf5s77j3syb42vtljjsyrnix2ycc6zdaychdaqa7gbncw5ajmelq"
diff --git a/terraform/modules/provisioners/provisioning.tf b/terraform/modules/provisioners/provisioning.tf
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 resource "null_resource" "status_check" {
-  count      = var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
+  count      = var.assign_public_ip || var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
   depends_on = [null_resource.dev_mode_provisioning]
 
   // Connection setup for all WLS instances
@@ -121,7 +121,7 @@ resource "null_resource" "status_check" {
 }
 
 resource "null_resource" "print_service_info" {
-  count      = var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
+  count      = var.assign_public_ip || var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
   depends_on = [null_resource.status_check]
 
   // Connection setup for all WLS instances
@@ -146,7 +146,7 @@ resource "null_resource" "print_service_info" {
 }
 
 resource "null_resource" "cleanup" {
-  count      = var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
+  count      = var.assign_public_ip || var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
   depends_on = [null_resource.print_service_info]
 
 
diff --git a/terraform/modules/provisioners/variables.tf b/terraform/modules/provisioners/variables.tf
@@ -48,11 +48,9 @@ variable "bastion_host_private_key" {
   default     = ""
 }
 
-#TODO: Check if this variable is really needed.
 variable "assign_public_ip" {
   type        = bool
-  description = "Set to true if you want the compute instance to have a public IP in addition to the private ip. Use with caution"
-  default     = true
+  description = "Set to true if the WebLogic compute instances will be created in a public subnet and should have a public IP"
 }
 
 variable "is_bastion_instance_required" {

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,9 @@ variable "bastion_host_private_key" {`
`48`	`48`	`default = ""`
`49`	`49`	`}`
`50`	`50`
`51`		`-#TODO: Check if this variable is really needed.`
`52`	`51`	`variable "assign_public_ip" {`
`53`	`52`	`type = bool`
`54`		`- description = "Set to true if you want the compute instance to have a public IP in addition to the private ip. Use with caution"`
`55`		`- default = true`
	`53`	`+ description = "Set to true if the WebLogic compute instances will be created in a public subnet and should have a public IP"`
`56`	`54`	`}`
`57`	`55`
`58`	`56`	`variable "is_bastion_instance_required" {`