Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix L2 leaves uplinks when MLAG is not desired #544

Merged
merged 2 commits into from
Dec 29, 2020
Merged

Fix L2 leaves uplinks when MLAG is not desired #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db4426b
#543 add ability to not use mlag accross L2 leaves
ksator Dec 27, 2020
74a5eb1
Update CI artifacts
ksator Dec 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .../molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-L2LEAF1A.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ interface Ethernet2

| Interface | Description | Type | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
| --------- | ----------- | ---- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
| Port-Channel1 | DC1-LEAF2A_Po7 | switched | access | 110-111,120-121,130-131,160-161 | - | - | - | - | 1 | - |
| Port-Channel1 | DC1-LEAF2A_Po7 | switched | access | 110-111,120-121,130-131,160-161 | - | - | - | - | - | - |

### Port-Channel Interfaces Device Configuration

Expand All @@ -413,7 +413,6 @@ interface Port-Channel1
description DC1-LEAF2A_Po7
switchport trunk allowed vlan 110-111,120-121,130-131,160-161
switchport mode trunk
mlag 1
```

## Loopback Interfaces
Expand Down
1 change: 0 additions & 1 deletion ...ons/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-L2LEAF1A.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ interface Port-Channel1
description DC1-LEAF2A_Po7
switchport trunk allowed vlan 110-111,120-121,130-131,160-161
switchport mode trunk
mlag 1
!
interface Ethernet1
description DC1-LEAF2A_Ethernet7
Expand Down
1 change: 0 additions & 1 deletion ...avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-L2LEAF1A.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ port_channel_interfaces:
description: DC1-LEAF2A_Po7
vlans: 110-111,120-121,130-131,160-161
mode: trunk
mlag: 1
ethernet_interfaces:
Ethernet1:
peer: DC1-LEAF2A
Expand Down
2 changes: 2 additions & 0 deletions ...s/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/inventory/group_vars/DC1_FABRIC.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,13 @@ l2leaf:
platform: vEOS-LAB
parent_l3leafs: [ DC1-SVC3A, DC1-SVC3B ]
uplink_interfaces: [ Ethernet1, Ethernet2 ]
mlag: true
mlag_interfaces: [ Ethernet3, Ethernet4 ]
spanning_tree_mode: mstp
spanning_tree_priority: 16384
node_groups:
DC1_L2LEAF1:
mlag: false
parent_l3leafs: [ DC1-LEAF2A, DC1-LEAF2B ]
filter:
tenants: [ Tenant_A ]
Expand Down
2 changes: 2 additions & 0 deletions ...a/avd/roles/eos_l3ls_evpn/templates/l3leaf_l2leafs_uplinks/l2leaf-port-channel-uplinks.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
description: {{ parent_l3leafs[loop.index0]}}_{{ 'Po' + l3leaf.channel_group_id }}
vlans: {{ leaf.vlans | arista.avd.list_compress }}
mode: trunk
{% if leaf.mlag == true %}
mlag: {{ channel_group_id }}
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}