adding support for disjoint jayer 2

terraform-cisco-modules · Oct 19, 2021 · 194bab7 · 194bab7
1 parent 5efdeef
commit 194bab7
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 3 deletions.
diff --git a/modules/port_channel_ethernet_uplinks/main.tf b/modules/port_channel_ethernet_uplinks/main.tf
@@ -10,6 +10,12 @@ resource "intersight_fabric_uplink_pc_role" "port_channel" {
   port_policy {
     moid = var.port_policy_moid
   }
+  dynamic "eth_network_group_policy" {
+    for_each = var.ethernet_network_group_policy_moid
+    content {
+      moid = eth_network_group_policy.value
+    }
+  }
   dynamic "flow_control_policy" {
     for_each = var.flow_control_policy_moid
     content {

diff --git a/modules/port_channel_ethernet_uplinks/variables.tf b/modules/port_channel_ethernet_uplinks/variables.tf
@@ -21,6 +21,12 @@ variable "admin_speed" {
   type        = string
 }
 
+variable "ethernet_network_control_policy_moid" {
+  default     = []
+  description = "A reference to a fabricEthNetworkControlPolicy resource."
+  type        = set(string)
+}
+
 variable "flow_control_policy_moid" {
   default     = []
   description = "A reference to a fabricFlowControlPolicy resource."

diff --git a/modules/port_role_ethernet_uplinks/main.tf b/modules/port_role_ethernet_uplinks/main.tf
@@ -26,6 +26,12 @@ resource "intersight_fabric_uplink_role" "port_role" {
   port_policy {
     moid = var.port_policy_moid
   }
+  dynamic "eth_network_group_policy" {
+    for_each = var.ethernet_network_group_policy_moid
+    content {
+      moid = eth_network_group_policy.value
+    }
+  }
   dynamic "flow_control_policy" {
     for_each = var.flow_control_policy_moid
     content {

diff --git a/modules/port_role_ethernet_uplinks/variables.tf b/modules/port_role_ethernet_uplinks/variables.tf
@@ -23,6 +23,12 @@ variable "breakout_port_id" {
   type        = number
 }
 
+variable "ethernet_network_control_policy_moid" {
+  default     = []
+  description = "A reference to a fabricEthNetworkControlPolicy resource."
+  type        = set(string)
+}
+
 variable "fec" {
   default     = "Auto"
   description = <<-EOT

diff --git a/modules/vlan_policy_add_vlan/variables.tf b/modules/vlan_policy_add_vlan/variables.tf
@@ -4,7 +4,7 @@
 #____________________________________________________________
 
 variable "auto_allow_on_uplinks" {
-  default     = true
+  default     = false
   description = "Used to determine whether this VLAN will be allowed on all uplink ports and PCs in this FI."
   type        = bool
 }

diff --git a/modules/vlan_policy_add_vlan_list/variables.tf b/modules/vlan_policy_add_vlan_list/variables.tf
@@ -4,7 +4,7 @@
 #____________________________________________________________
 
 variable "auto_allow_on_uplinks" {
-  default     = true
+  default     = false
   description = "Used to determine whether this VLAN will be allowed on all uplink ports and PCs in this FI."
   type        = bool
 }

diff --git a/modules/vlan_policy_add_vlan_map/variables.tf b/modules/vlan_policy_add_vlan_map/variables.tf
@@ -4,7 +4,7 @@
 #____________________________________________________________
 
 variable "auto_allow_on_uplinks" {
-  default     = true
+  default     = false
   description = "Used to determine whether this VLAN will be allowed on all uplink ports and PCs in this FI."
   type        = bool
 }