From eaec7aee64bc5ee1a230d99fdce8d0ad1806fb93 Mon Sep 17 00:00:00 2001 From: bhlohumi Date: Tue, 30 Apr 2024 11:08:34 +0530 Subject: [PATCH] Automation Toolkit Release v2024.2.2 --- cd3_automation_toolkit/Release-Notes | 3 ++- cd3_automation_toolkit/user-scripts/terraform/fss.tf | 2 +- cd3_automation_toolkit/user-scripts/terraform/loadbalancer.tf | 2 +- .../user-scripts/terraform/networkloadbalancer.tf | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cd3_automation_toolkit/Release-Notes b/cd3_automation_toolkit/Release-Notes index 273235842..d800612e4 100644 --- a/cd3_automation_toolkit/Release-Notes +++ b/cd3_automation_toolkit/Release-Notes @@ -7,7 +7,8 @@ Apr 30, 2024 3. Dropdowns for Region and Compartment while running setUpOCI using Jenkins. 4. Fix Image OCIDs for OCI Work VM deployment using RM stack. 5. Option to execute 3rd Party Services from CD3 - Show OCI along with CIS Compliance Check script -5. Upgrade of existing terraform modules - identity, buckets, LBaaS, NLBs, +6. Upgrade of existing terraform modules - identity, buckets, LBaaS, NLBs (without DNS health check as of now). +7. Enhance CD3 Validator for OCI Buckets. ------------------------------------- CD3 Automation Toolkit Tag v2024.2.0 diff --git a/cd3_automation_toolkit/user-scripts/terraform/fss.tf b/cd3_automation_toolkit/user-scripts/terraform/fss.tf index 8ff897116..5c5fb81f3 100644 --- a/cd3_automation_toolkit/user-scripts/terraform/fss.tf +++ b/cd3_automation_toolkit/user-scripts/terraform/fss.tf @@ -21,7 +21,7 @@ data "oci_core_vcns" "oci_vcns_fss" { } module "mts" { - # depends_on = [module.vcns, module.subnets] # Uncomment to execute Networking and Mount Target together + # depends_on = [module.vcns, module.subnets,module.nsgs]] # Uncomment to execute Networking and Mount Target together #Required source = "./modules/storage/file-storage/mount-target" for_each = (var.mount_targets != null || var.mount_targets != {}) ? var.mount_targets : {} diff --git a/cd3_automation_toolkit/user-scripts/terraform/loadbalancer.tf b/cd3_automation_toolkit/user-scripts/terraform/loadbalancer.tf index 6abc408a2..bfb50901d 100644 --- a/cd3_automation_toolkit/user-scripts/terraform/loadbalancer.tf +++ b/cd3_automation_toolkit/user-scripts/terraform/loadbalancer.tf @@ -36,7 +36,7 @@ locals { } module "load-balancers" { - # depends_on = [module.vcns, module.subnets] # Uncomment to execute Networking and Load Balancer together + # depends_on = [module.vcns, module.subnets,module.nsgs] # Uncomment to execute Networking and Load Balancer together source = "./modules/loadbalancer/lb-load-balancer" for_each = var.load_balancers != null ? var.load_balancers : {} diff --git a/cd3_automation_toolkit/user-scripts/terraform/networkloadbalancer.tf b/cd3_automation_toolkit/user-scripts/terraform/networkloadbalancer.tf index 293f3ea9f..cdbe7eb59 100644 --- a/cd3_automation_toolkit/user-scripts/terraform/networkloadbalancer.tf +++ b/cd3_automation_toolkit/user-scripts/terraform/networkloadbalancer.tf @@ -21,6 +21,7 @@ data "oci_core_vcns" "oci_vcns_nlb" { } module "network-load-balancers" { + # depends_on = [module.nsgs] # Uncomment to create NSG and NLBs together source = "./modules/networkloadbalancer/nlb" for_each = var.network_load_balancers != null ? var.network_load_balancers : {} network_compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : null