Merge pull request #108 from oracle-quickstart/topic_robesanc_jcs-13489

JCS-13489 Create stack with IDCS fails if LB is not selected in the UI

Author: roberto-sanchez-herrera

terraform/locals.tf

@@ -60,12 +60,17 @@ locals {
     ["Standard Edition", "Enterprise Edition", "Suite Edition"],
   )
 
-  new_lb_ip                  = !var.add_load_balancer || local.use_existing_lb ? "" : element(coalescelist(module.load-balancer[0].wls_loadbalancer_ip_addresses, [""]), 0)
+  # Add a load balancer if
+  # - User explicitly says he wants a load balancer, or
+  # - User selects IDCS, because IDCS requires a load balancer
+  add_load_balancer = var.add_load_balancer || var.is_idcs_selected
+
+  new_lb_ip                  = !local.add_load_balancer || local.use_existing_lb ? "" : element(coalescelist(module.load-balancer[0].wls_loadbalancer_ip_addresses, [""]), 0)
   new_lb_id                  = element(concat(module.load-balancer[*].wls_loadbalancer_id, [""]), 0)
   existing_lb_ip             = local.use_existing_lb && local.valid_existing_lb ? local.existing_lb_object_as_list[0].ip_addresses[0] : ""
   existing_lb_object_as_list = [for lb in data.oci_load_balancer_load_balancers.existing_load_balancers_data_source.load_balancers[*] : lb if lb.id == var.existing_load_balancer_id]
   valid_existing_lb          = length(local.existing_lb_object_as_list) == 1
-  use_existing_lb            = var.add_load_balancer && var.existing_load_balancer_id != ""
+  use_existing_lb            = local.add_load_balancer && var.existing_load_balancer_id != ""
   lb_backendset_name         = local.use_existing_lb ? var.backendset_name_for_existing_load_balancer : "${local.service_name_prefix}-lb-backendset"
   existing_lb_subnet_1_id    = local.use_existing_lb && local.valid_existing_lb ? local.existing_lb_object_as_list[0].subnet_ids[0] : ""
   existing_lb_subnet_2_id    = local.use_existing_lb && local.valid_existing_lb ? (var.is_lb_private ? "" : (length(local.existing_lb_object_as_list[0].subnet_ids) > 1 ? local.existing_lb_object_as_list[0].subnet_ids[1] : "")) : ""
@@ -83,11 +88,11 @@ locals {
 
   admin_ip_address      = local.assign_weblogic_public_ip ? module.compute.instance_public_ips[0] : module.compute.instance_private_ips[0]
   admin_console_app_url = format("https://%s:%s/console", local.admin_ip_address, var.wls_extern_ssl_admin_port)
-  sample_app_protocol   = var.add_load_balancer ? "https" : "http"
-  sample_app_url_lb_ip  = var.deploy_sample_app && var.add_load_balancer ? format("%s://%s/sample-app", local.sample_app_protocol, local.lb_ip) : ""
+  sample_app_protocol   = local.add_load_balancer ? "https" : "http"
+  sample_app_url_lb_ip  = var.deploy_sample_app && local.add_load_balancer ? format("%s://%s/sample-app", local.sample_app_protocol, local.lb_ip) : ""
   sample_app_url_wls_ip = var.deploy_sample_app ? format("https://%s:%s/sample-app", local.admin_ip_address, var.wls_ms_extern_ssl_port) : ""
-  sample_app_url        = var.wls_edition != "SE" ? (var.deploy_sample_app && var.add_load_balancer ? local.sample_app_url_lb_ip : local.sample_app_url_wls_ip) : ""
-  sample_idcs_app_url = var.deploy_sample_app && var.add_load_balancer && var.is_idcs_selected ? format(
+  sample_app_url        = var.wls_edition != "SE" ? (var.deploy_sample_app && local.add_load_balancer ? local.sample_app_url_lb_ip : local.sample_app_url_wls_ip) : ""
+  sample_idcs_app_url = var.deploy_sample_app && local.add_load_balancer && var.is_idcs_selected ? format(
     "%s://%s/__protected/idcs-sample-app",
     local.sample_app_protocol,
     local.lb_ip,

terraform/main.tf

@@ -41,10 +41,10 @@ module "network-vcn-config" {
 
   wls_security_list_name       = !local.assign_weblogic_public_ip ? "bastion-security-list" : "wls-security-list"
   wls_subnet_cidr              = local.wls_subnet_cidr
-  wls_ms_source_cidrs          = var.add_load_balancer ? [local.lb_subnet_1_subnet_cidr] : ["0.0.0.0/0"]
-  load_balancer_min_value      = var.add_load_balancer ? var.wls_ms_extern_port : var.wls_ms_extern_ssl_port
-  load_balancer_max_value      = var.add_load_balancer ? var.wls_ms_extern_port : var.wls_ms_extern_ssl_port
-  create_load_balancer         = var.add_load_balancer
+  wls_ms_source_cidrs          = local.add_load_balancer ? [local.lb_subnet_1_subnet_cidr] : ["0.0.0.0/0"]
+  load_balancer_min_value      = local.add_load_balancer ? var.wls_ms_extern_port : var.wls_ms_extern_ssl_port
+  load_balancer_max_value      = local.add_load_balancer ? var.wls_ms_extern_port : var.wls_ms_extern_ssl_port
+  create_load_balancer         = local.add_load_balancer
   resource_name_prefix         = local.service_name_prefix
   bastion_subnet_cidr          = local.bastion_subnet_cidr
   is_bastion_instance_required = var.is_bastion_instance_required
@@ -76,7 +76,7 @@ module "network-vcn-config" {
 
 module "network-lb-nsg" {
   source         = "./modules/network/nsg"
-  count          = local.use_existing_lb ? 0 : var.add_load_balancer && var.lb_subnet_1_cidr != "" ? 1 : 0
+  count          = local.use_existing_lb ? 0 : local.add_load_balancer && var.lb_subnet_1_cidr != "" ? 1 : 0
   compartment_id = local.network_compartment_id
   vcn_id         = local.vcn_id
   nsg_name       = "${local.service_name_prefix}-lb-nsg"
@@ -142,7 +142,7 @@ module "network-compute-managed-nsg" {
 /* Create primary subnet for Load balancer only */
 module "network-lb-subnet-1" {
   source          = "./modules/network/subnet"
-  count           = local.use_existing_lb ? 0 : var.add_load_balancer && var.lb_subnet_1_id == "" ? 1 : 0
+  count           = local.use_existing_lb ? 0 : local.add_load_balancer && var.lb_subnet_1_id == "" ? 1 : 0
   compartment_id  = local.network_compartment_id
   vcn_id          = local.vcn_id
   dhcp_options_id = module.network-vcn-config[0].dhcp_options_id
@@ -207,7 +207,7 @@ module "policies" {
   use_autoscaling             = var.use_autoscaling
   ocir_auth_token_id          = var.ocir_auth_token_id
   add_fss                     = var.add_fss
-  add_load_balancer           = var.add_load_balancer
+  add_load_balancer           = local.add_load_balancer
   fss_compartment_id          = var.fss_compartment_id == "" ? var.compartment_ocid : var.fss_compartment_id
   mount_target_compartment_id = var.mount_target_compartment_id == "" ? var.compartment_ocid : var.mount_target_compartment_id
 }
@@ -379,7 +379,7 @@ module "validators" {
   vcn_name            = var.wls_vcn_name
   use_regional_subnet = local.use_regional_subnet
 
-  add_load_balancer                          = var.add_load_balancer
+  add_load_balancer                          = local.add_load_balancer
   is_lb_private                              = var.is_lb_private
   existing_load_balancer_id                  = var.existing_load_balancer_id
   existing_load_balancer_found               = length(local.existing_lb_object_as_list) == 1
@@ -457,7 +457,7 @@ module "fss" {
 
 module "load-balancer" {
   source = "./modules/lb/loadbalancer"
-  count  = (var.add_load_balancer && var.existing_load_balancer_id == "") ? 1 : 0
+  count  = (local.add_load_balancer && var.existing_load_balancer_id == "") ? 1 : 0
 
   compartment_id           = local.network_compartment_id
   lb_reserved_public_ip_id = compact([var.lb_reserved_public_ip_id])
@@ -516,9 +516,9 @@ module "observability-autoscaling" {
 
 module "compute" {
   source                 = "./modules/compute/wls_compute"
-  add_loadbalancer       = var.add_load_balancer
+  add_loadbalancer       = local.add_load_balancer
   is_lb_private          = var.is_lb_private
-  load_balancer_id       = var.add_load_balancer ? (var.existing_load_balancer_id != "" ? var.existing_load_balancer_id : element(coalescelist(module.load-balancer[*].wls_loadbalancer_id, [""]), 0)) : ""
+  load_balancer_id       = local.add_load_balancer ? (var.existing_load_balancer_id != "" ? var.existing_load_balancer_id : element(coalescelist(module.load-balancer[*].wls_loadbalancer_id, [""]), 0)) : ""
   assign_public_ip       = local.assign_weblogic_public_ip
   availability_domain    = local.wls_availability_domain
   compartment_id         = var.compartment_ocid
@@ -637,10 +637,10 @@ module "compute" {
 
 module "load-balancer-backends" {
   source = "./modules/lb/backends"
-  count  = var.add_load_balancer ? 1 : 0
+  count  = local.add_load_balancer ? 1 : 0
 
   resource_name_prefix = local.service_name_prefix
-  load_balancer_id     = var.add_load_balancer ? (var.existing_load_balancer_id != "" ? var.existing_load_balancer_id : element(coalescelist(module.load-balancer[*].wls_loadbalancer_id, [""]), 0)) : ""
+  load_balancer_id     = local.add_load_balancer ? (var.existing_load_balancer_id != "" ? var.existing_load_balancer_id : element(coalescelist(module.load-balancer[*].wls_loadbalancer_id, [""]), 0)) : ""
   use_existing_lb      = local.use_existing_lb
   lb_backendset_name   = local.lb_backendset_name
   num_vm_instances     = var.wls_node_count