Development (#298)

skommala · abhijit-paranjpe · telake · web-flow · commit b689c0105178 · 2024-12-20T11:49:22.000+05:30
Merge from development to main

---------

Co-authored-by: Abhijit Paranjpe &lt;109541284+abhijit-paranjpe@users.noreply.github.com&gt;
Co-authored-by: telake &lt;tim.lake@oracle.com&gt;
Co-authored-by: Roberto Sanchez Herrera &lt;roberto.s.sanchez@oracle.com&gt;
Co-authored-by: P M Darshan &lt;p.m.darshan@oracle.com&gt;
Co-authored-by: C R Aniruddh Srivatsa &lt;c.r.aniruddh.srivatsa@oracle.com&gt;
Co-authored-by: Mahuwa Barman &lt;106961326+Mahuwa-Barman@users.noreply.github.com&gt;
Co-authored-by: Chintamani Bhat &lt;chintamani.bhat@oracle.com&gt;
Co-authored-by: Sarada Kommalapati &lt;sarada.kommlapati@oracle.com&gt;
Co-authored-by: Adrian Padilla Duarte &lt;adrian.padilla@oracle.com&gt;
Co-authored-by: Mahuwa-Barman &lt;mahuwa.barman@oracle.com&gt;
Co-authored-by: srjanaki &lt;srinath.janakiraman@oracle.com&gt;
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,2024, 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.4.1-241017053318"
+tf_script_version        = "24.4.3-241219063253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "24.4.1-ol8.8-23.12.13-241017-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa42huy5647ywxakme23tq4m4a2pplwnjtkger2qlsdabb7og65xlq"
+listing_resource_version = "24.4.3-ol8.8-23.12.13-241219-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa3wfcdv56fwwvkvo2bmccsl2c2xwj7lnfavs4sy6q23lmxom4mcja"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "24.4.1-ol8.8-23.12.13-241017-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaak2mrnmdiv2g4yc37vq6dhxiswtuuc4sn4543meowfvbntnepcpna"
+ucm_listing_resource_version = "24.4.3-ol8.8-23.12.13-241219-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaakfkcqazhsjyswm3r6bflsk3ci6iwiqpizsqgehhjhiqypn52uobq"
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/terraform/images/mp_image_ee_ucm.tfvars
@@ -1,9 +1,9 @@
 # Copyright (c) 2023,2024, 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.4.1-241017053318"
+tf_script_version        = "24.4.3-241219063253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "24.4.1-ol8.8-23.12.13-241017-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaak2mrnmdiv2g4yc37vq6dhxiswtuuc4sn4543meowfvbntnepcpna"
+listing_resource_version = "24.4.3-ol8.8-23.12.13-241219-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaakfkcqazhsjyswm3r6bflsk3ci6iwiqpizsqgehhjhiqypn52uobq"
 
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.tfvars
@@ -1,9 +1,8 @@
 # Copyright (c) 2023,2024, 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.4.1-241017053318"
+tf_script_version        = "24.4.3-241219063253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "24.4.1-ol8.8-23.12.13-241017-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa3tpmkcjmenrphbc5jci2sjmc4fcxummfqw72xv72ci6ndbyf2qnq"
-
+listing_resource_version = "24.4.3-ol8.8-23.12.13-241219-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaachefwpa57fwzf47la6fc65ihxow6scpt7c3omacq5rbljztpm4ba"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
@@ -1,12 +1,12 @@
 # Copyright (c) 2023,2024, 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.4.1-241017053318"
+tf_script_version        = "24.4.3-241219063253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "24.4.1-ol8.8-23.12.13-241017-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaazqkife3vsvjc2mdnapumkehzhedip7vn3pblclu2rlhplcsu4z2a"
+listing_resource_version = "24.4.3-ol8.8-23.12.13-241219-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa5mhs4bdlsre7vlczzcdtz2a57shlfrw4k7c3r6quhtiijosqb3hq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "24.4.1-ol8.8-23.12.13-241017-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaruq5xvtwyn3g63kuzf2wyuwonyyxsibqf3ojmtuyphx2lu6g7gdq"
+ucm_listing_resource_version = "24.4.3-ol8.8-23.12.13-241219-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaqbh7qqdgsv54p7dirm3oqx2zvr7qtosvercgoicqfj2txjpudthq"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/terraform/images/mp_image_suite_ucm.tfvars
@@ -1,9 +1,9 @@
 # Copyright (c) 2023,2024, 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.4.1-241017053318"
+tf_script_version        = "24.4.3-241219063253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "24.4.1-ol8.8-23.12.13-241017-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaruq5xvtwyn3g63kuzf2wyuwonyyxsibqf3ojmtuyphx2lu6g7gdq"
+listing_resource_version = "24.4.3-ol8.8-23.12.13-241219-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaqbh7qqdgsv54p7dirm3oqx2zvr7qtosvercgoicqfj2txjpudthq"
 
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -631,6 +631,7 @@ module "compute" {
   wls_server_startup_args   = var.wls_server_startup_args
   wls_existing_vcn_id       = var.wls_existing_vcn_id
   create_policies           = var.create_policies
+  place_all_compute_in_same_ad = var.place_all_compute_in_same_ad
 
   # Secured Production Mode
   configure_secure_mode              = var.configure_secure_mode
diff --git a/terraform/modules/compute/wls_compute/variables.tf b/terraform/modules/compute/wls_compute/variables.tf
@@ -26,6 +26,12 @@ variable "availability_domain" {
   description = "The label of the availability domain where the compute will be created"
 }
 
+variable "place_all_compute_in_same_ad" {
+  type        = bool
+  description = "Set to true if you want to use the same Availability Domain for all Compute instances as the WebLogic Administration Server's Compute instance. Otherwise, instances will be distributed across Availability Domains."
+  default     = false
+}
+
 variable "instance_image_id" {
   type        = string
   description = "The OCID of the image used to create the compute instance"
diff --git a/terraform/modules/compute/wls_compute/wls_compute.tf b/terraform/modules/compute/wls_compute/wls_compute.tf
@@ -11,7 +11,7 @@ module "wls-instances" {
 
   instance_params = { for x in range(var.num_vm_instances) : "${local.host_label}-${format("%02d", x)}" => {
 
-    availability_domain = var.use_regional_subnet ? local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] : var.availability_domain
+    availability_domain = var.use_regional_subnet ? (var.place_all_compute_in_same_ad ? var.availability_domain : local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] ) : var.availability_domain
 
     compartment_id = var.compartment_id
     display_name   = "${local.host_label}-${x}"
diff --git a/terraform/modules/compute/wls_compute/wls_volume.tf b/terraform/modules/compute/wls_compute/wls_volume.tf
@@ -4,7 +4,7 @@
 module "middleware-volume" {
   source = "../volume"
   bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-mw-block-${format("%02d", x)}" => {
-    ad             = var.use_regional_subnet ? local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] : var.availability_domain
+    ad             = var.use_regional_subnet ? (var.place_all_compute_in_same_ad ? var.availability_domain : local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)]) : var.availability_domain
     compartment_id = var.compartment_id
     display_name   = "${var.resource_name_prefix}-mw-block-${x}"
     bv_size        = var.volume_size
@@ -19,7 +19,7 @@ module "middleware-volume" {
 module "data-volume" {
   source = "../volume"
   bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-data-block-${format("%02d", x)}" => {
-    ad             = var.use_regional_subnet ? local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] : var.availability_domain
+    ad             = var.use_regional_subnet ? (var.place_all_compute_in_same_ad ? var.availability_domain : local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)]) : var.availability_domain
     compartment_id = var.compartment_id
     display_name   = "${var.resource_name_prefix}-data-block-${x}"
     bv_size        = var.volume_size
diff --git a/terraform/modules/policies/locals.tf b/terraform/modules/policies/locals.tf
@@ -49,6 +49,11 @@ locals {
   cloning_policy_statement2 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to inspect compartments in tenancy"
   cloning_policy_statement  = compact([local.cloning_policy_statement1, local.cloning_policy_statement2])
 
+  # These policy statements are required for enabling the plugin
+  plugin_policy_statement1 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to manage instance-agent-plugins in compartment id ${var.compartment_id}"
+  plugin_policy_statement2 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use wlms-managed-instance-plugins in tenancy"
+  plugin_policy_statement = compact([local.plugin_policy_statement1, local.plugin_policy_statement2])
+
   #Policies for WLS instance principal dynamic group
   autoscaling_statement1 = var.use_autoscaling ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use repos in tenancy" : ""
   autoscaling_statement2 = var.use_autoscaling ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to manage functions-family in compartment id ${var.compartment_id}" : ""
@@ -124,7 +129,7 @@ locals {
   secure_mode_statement  = compact([local.secure_mode_statement1, local.secure_mode_statement2, local.secure_mode_statement3, local.secure_mode_statement4, local.secure_mode_statement5, local.secure_mode_secrets_policy_statement1, local.secure_mode_secrets_policy_statement2])
 
   #TODO: When other categories with more statements are added here, concat them with service_statements
-  policy_statements = concat(local.service_statements, local.cloning_policy_statement, local.autoscaling_statements, local.secure_mode_statement)
+  policy_statements = concat(local.service_statements, local.cloning_policy_statement, local.plugin_policy_statement, local.autoscaling_statements, local.secure_mode_statement)
 
   reserved_ips_info = var.compartment_id == "" ? [{ id = var.resource_name_prefix }] : []
 
diff --git a/terraform/network_variables.tf b/terraform/network_variables.tf
@@ -75,6 +75,12 @@ variable "wls_availability_domain_name" {
   default     = ""
 }
 
+variable "place_all_compute_in_same_ad" {
+  type        = bool
+  description = "Set to true if you want to use the same Availability Domain for all Compute instances as the WebLogic Administration Server's Compute instance. Otherwise, instances will be distributed across Availability Domains."
+  default     = false
+}
+
 variable "assign_weblogic_public_ip" {
   type        = bool
   description = "Set to true if the WebLogic compute instances will be created in a public subnet and should have a public IP"
diff --git a/terraform/schema.yaml b/terraform/schema.yaml
@@ -96,6 +96,7 @@ groupings:
       #- ${image_mode}
       #- ${terms_and_conditions}
       - ${wls_availability_domain_name}
+      - ${place_all_compute_in_same_ad}
       - ${wls_subnet_id}
       - ${wls_subnet_cidr}
       - ${existing_admin_server_nsg_id}
@@ -458,6 +459,19 @@ variables:
                 - ${subnet_span}
                 - "Regional Subnet"
 
+  place_all_compute_in_same_ad:
+    visible:
+      and:
+        - ${orm_create_mode}
+        - eq:
+            - ${subnet_span}
+            - "Regional Subnet"
+    type: boolean
+    required: true
+    default: false
+    title: "Use Same Availability Domain for all Compute Instances"
+    description: "Use the same Availability Domain for all Compute instances as that of the WebLogic Administration Server's Compute instance. If this option is not selected, the compute instances will be distributed across Availability Domains."
+
   wls_node_count:
     type: integer
     title: "Node Count"
diff --git a/terraform/schema_14110.yaml b/terraform/schema_14110.yaml
@@ -69,6 +69,7 @@ groupings:
       #- ${image_mode}
       #- ${terms_and_conditions}
       - ${wls_availability_domain_name}
+      - ${place_all_compute_in_same_ad}
       - ${wls_subnet_id}
       - ${wls_subnet_cidr}
       - ${existing_admin_server_nsg_id}
@@ -456,6 +457,19 @@ variables:
                 - ${subnet_span}
                 - "Regional Subnet"
 
+  place_all_compute_in_same_ad:
+    visible:
+      and:
+        - ${orm_create_mode}
+        - eq:
+            - ${subnet_span}
+            - "Regional Subnet"
+    type: boolean
+    required: true
+    default: false
+    title: "Use Same Availability Domain for all Compute Instances"
+    description: "Use the same Availability Domain for all Compute instances as that of the WebLogic Administration Server's Compute instance. If this option is not selected, the compute instances will be distributed across Availability Domains."
+
   wls_node_count:
     type: integer
     title: "Node Count"
