Skip to content

Commit

Permalink
Add apic include option to port tracking
Browse files Browse the repository at this point in the history
  • Loading branch information
danischm committed Jan 25, 2024
1 parent af5e278 commit bc334f0
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## 0.8.1 (unreleased)

- Make L3 PBR destination MAC optional
- Add `apic_include` option to `port_tracking` configuration

## 0.8.0

Expand Down
9 changes: 5 additions & 4 deletions aci_fabric_policies.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ module "aci_fabric_wide_settings" {
module "aci_port_tracking" {
source = "./modules/terraform-aci-port-tracking"

count = local.modules.aci_port_tracking == true && var.manage_fabric_policies ? 1 : 0
admin_state = try(local.fabric_policies.port_tracking.admin_state, local.defaults.apic.fabric_policies.port_tracking.admin_state)
delay = try(local.fabric_policies.port_tracking.delay, local.defaults.apic.fabric_policies.port_tracking.delay)
min_links = try(local.fabric_policies.port_tracking.min_links, local.defaults.apic.fabric_policies.port_tracking.min_links)
count = local.modules.aci_port_tracking == true && var.manage_fabric_policies ? 1 : 0
admin_state = try(local.fabric_policies.port_tracking.admin_state, local.defaults.apic.fabric_policies.port_tracking.admin_state)
delay = try(local.fabric_policies.port_tracking.delay, local.defaults.apic.fabric_policies.port_tracking.delay)
min_links = try(local.fabric_policies.port_tracking.min_links, local.defaults.apic.fabric_policies.port_tracking.min_links)
apic_include = try(local.fabric_policies.port_tracking.apic_include, null)
}

module "aci_ptp" {
Expand Down
1 change: 1 addition & 0 deletions modules/terraform-aci-port-tracking/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ module "aci_port_tracking" {
| <a name="input_admin_state"></a> [admin\_state](#input\_admin\_state) | Admin state. | `bool` | `false` | no |
| <a name="input_delay"></a> [delay](#input\_delay) | Delay. Minimum value: 1. Maximum value: 300. | `number` | `120` | no |
| <a name="input_min_links"></a> [min\_links](#input\_min\_links) | Minimum links. Minimum value: 0. Maximum value: 48. | `number` | `0` | no |
| <a name="input_include_apic"></a> [include\_apic](#input\_include\_apic) | Include APIC ports. | `bool` | `null` | no |

## Outputs

Expand Down
7 changes: 4 additions & 3 deletions modules/terraform-aci-port-tracking/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ resource "aci_rest_managed" "infraPortTrackPol" {
dn = "uni/infra/trackEqptFabP-default"
class_name = "infraPortTrackPol"
content = {
adminSt = var.admin_state == true ? "on" : "off"
delay = var.delay
minlinks = var.min_links
adminSt = var.admin_state == true ? "on" : "off"
delay = var.delay
minlinks = var.min_links
includeApicPorts = var.include_apic == true ? "yes" : (var.include_apic == false ? "no" : null)
}
}
5 changes: 5 additions & 0 deletions modules/terraform-aci-port-tracking/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ variable "min_links" {
}
}

variable "include_apic" {
description = "Include APIC ports."
type = bool
default = null
}

0 comments on commit bc334f0

Please sign in to comment.