diff --git a/roles/fabric/templates/bridge.intf.j2 b/roles/fabric/templates/bridge.intf.j2 index 8200efb..a068af6 100644 --- a/roles/fabric/templates/bridge.intf.j2 +++ b/roles/fabric/templates/bridge.intf.j2 @@ -1,8 +1,8 @@ {# Note that there must be exactly one VLAN-aware bridge. #} {% set bridge = interfaces | selectattr('type') | selectattr('type.value', '==', 'bridge') | first %} -{# interfaces (always bonds on Mellanox) that belong to this bridge #} -{% set ports = interfaces | selectattr('bridge') | selectattr('bridge.name', '==', bridge.name) %} -{# allowed VLANs can be specified on the bridge, any of its ports, or #} +{# interfaces that belong to this bridge #} +{% set ports = interfaces | selectattr('enabled') | selectattr('bridge') | selectattr('bridge.name', '==', bridge.name) %} +{# allowed VLANs can be specified on the bridge, any of its ports, or all VLANs in NetBox #} {% set my_vlans = bridge.tagged_vlans or (ports | iface_vlans | flatten | sort | unique) or vlans %} {% set my_vlan_ids = my_vlans | map(attribute='vid') | sort -%}