Automation Toolkit Release v10.2

Author: bhlohumi

cd3_automation_toolkit/Network/BaseNetwork/templates/drg-route-table-template

@@ -24,13 +24,10 @@ drg_route_tables = {
 
         {% if drg_rt_dstrb_tf_name !='' %}
         import_drg_route_distribution_id = "{{ drg_rt_dstrb_res_name }}"
-        {% else %}
-        import_drg_route_distribution_id = ""
         {% endif %}
         {% if is_ecmp_enabled and is_ecmp_enabled != 'nan' and is_ecmp_enabled != '' %}
-        is_ecmp_enabled = "{{ is_ecmp_enabled }}" {% else %}
-        is_ecmp_enabled = "false"
-        {% endif %} {# Defaults to false - set as per terraform hashicorp #}
+        is_ecmp_enabled = "{{ is_ecmp_enabled }}"
+        {% endif %}
     {#  ##Do not modify below this line##  #}
     {#                                     #}
     {#  ###Section for adding Defined and Freeform Tags###  #}

cd3_automation_toolkit/setUpOCI.py

@@ -288,7 +288,7 @@ def export_subnets(inputfile, outdir, service_dir,prefix,config,export_regions,
     print("\n\nExecute tf_import_commands_network_subnets_nonGF.sh script created under each region directory to synch TF with OCI Network objects\n")
 
 
-def export_nsg(inputfile, outdir, prefix,service_dir_nt,config,export_regions,ct):
+def export_nsg(inputfile, outdir, service_dir_nt, prefix,config,export_regions,ct):
     if len(outdir_struct) != 0:
         service_dir = outdir_struct['nsg']
     else:

cd3_automation_toolkit/user-scripts/terraform/modules/network/drg-route-table/main.tf

@@ -17,7 +17,4 @@ resource "oci_core_drg_route_table" "drg_route_table" {
   freeform_tags                    = var.freeform_tags
   import_drg_route_distribution_id = var.import_drg_route_distribution_id
   is_ecmp_enabled                  = var.is_ecmp_enabled
-  lifecycle {
-    ignore_changes = [is_ecmp_enabled]
-    }
 }

cd3_automation_toolkit/user-scripts/terraform/modules/network/drg-route-table/variables.tf

@@ -17,7 +17,7 @@ variable "import_drg_route_distribution_id" {
 
 variable "is_ecmp_enabled" {
   type    = bool
-  default = false
+  default = null
 }
 
 variable "defined_tags" {

cd3_automation_toolkit/user-scripts/terraform/network.tf

@@ -509,7 +509,7 @@ module "drg-route-tables" {
   freeform_tags                    = each.value.freeform_tags == {} ? null : each.value.freeform_tags
   display_name                     = each.value.display_name != null ? each.value.display_name : null
   import_drg_route_distribution_id = each.value.import_drg_route_distribution_id != null && each.value.import_drg_route_distribution_id != "" ? (length(regexall("ocid1.drgroutedistribution.oc1*", each.value.import_drg_route_distribution_id)) > 0 ? each.value.import_drg_route_distribution_id : (length(regexall(".Autogenerated-Import-Route-Distribution-for*", each.value.import_drg_route_distribution_id)) > 0 ? data.oci_core_drg_route_distributions.drg_route_distributions[each.value.import_drg_route_distribution_id].drg_route_distributions[0].id : merge(module.drg-route-distributions.*...)[each.value.import_drg_route_distribution_id]["drg_route_distribution_tf_id"])) : null
-  is_ecmp_enabled                  = each.value.is_ecmp_enabled != null ? each.value.is_ecmp_enabled : false
+  is_ecmp_enabled                  = each.value.is_ecmp_enabled != null ? each.value.is_ecmp_enabled : null
 }
 
 /*

cd3_automation_toolkit/user-scripts/terraform/variables_example.tf

@@ -495,7 +495,14 @@ variable "drg_attachments" {
 }
 
 variable "drg_route_tables" {
-  type    = map(any)
+  type = map(object({
+    drg_id            = string
+    display_name      = optional(string)
+    defined_tags      = optional(map(any))
+    freeform_tags     = optional(map(any))
+ 	is_ecmp_enabled   = optional(bool)
+	import_drg_route_distribution_id  = optional(string)
+  }))
   default = {}
 }