rc/network
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fabric: consolidate interface templates

Browse source 
Mostly to avoid special‐casing bond interfaces, and to support BGP
connections over virtual interfaces.
This commit is contained in:
Timotej Lazar 2024-02-27 10:59:06 +01:00
parent 5381fecaa4
commit ce7c1bd49e
6 changed files with 28 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

23
roles/fabric/templates/bond.intf.j2
View file

@ -1,23 +0,0 @@
{% for bond in interfaces | map(attribute='lag') | reject('none') | sort(attribute='name') | unique %}
{% set iface = interfaces | selectattr('id', '==', bond.id) | first %}
{% set members = interfaces | selectattr('lag') | selectattr('lag.name', '==', bond.name) -%}
auto {{ bond.name }}
iface {{ bond.name }}
bond-slaves {{ members | map(attribute='name') | join(' ') }}
{% if iface.mode.value == 'access' and iface.untagged_vlan %}
bridge-access {{ iface.untagged_vlan.vid }}
{% elif iface.mode.value == 'tagged' and iface.tagged_vlans %}
bridge-vids {{ iface.tagged_vlans | map(attribute='vid') | join(' ') }}
{% endif %}
{#- If the peer shares a bond with the same name, generate a clag-id for it unless the bonded link is to peer itself. #}
{% if peer is defined %}
{% set peer_members = hostvars[peer].interfaces
| selectattr('lag') | selectattr('lag.name', '==', bond.name) %}
{% if peer_members | iface_peer | reject('eq', inventory_hostname) %}
clag-id {{ (members + peer_members) | cl_clag_id }}
{% endif %}
{% endif %}
{% endfor %}

2
roles/fabric/templates/bridge.intf.j2
View file

@ -10,7 +10,7 @@ auto {{ bridge.name }}
iface {{ bridge.name }}
bridge-ports {{ ports | map(attribute='name') | join(' ') }}{% if my_vlans %} vxlan{% endif +%}
bridge-vlan-aware yes
bridge-pvid 1
bridge-pvid {{ bridge.untagged_vlan | default(1, true) }}
{% if bridge.mode.value == 'tagged' and my_vlans %}
bridge-vids {{ my_vlan_ids | join(' ') }}
{% endif %}

24
roles/fabric/templates/switch.intf.j2
View file

@ -1,11 +1,28 @@
{% for iface in interfaces | iface_real | rejectattr('mgmt_only') | selectattr('enabled') %}
{% for iface in interfaces | rejectattr('name', 'in', ('lo', 'bridge')) | rejectattr('mgmt_only') | selectattr('enabled') %}
auto {{ iface.name }}
iface {{ iface.name }}
{% if iface.vrf %}
vrf {{ iface.vrf.name }}
{% endif -%}
{# Set allowed VLANs if we are part of the bridge. #}
{% if iface.mtu %}
mtu {{ iface.mtu }}
{% endif -%}
{% if iface.type.value == 'lag' %}
{#- Bond/MLAG stuff. #}
{% set members = interfaces | selectattr('lag') | selectattr('lag.name', '==', iface.name) %}
bond-slaves {{ members | map(attribute='name') | join(' ') }}
{# If the peer shares a bond with the same name, generate a clag-id for it unless the bonded link is to peer itself. #}
{% if peer is defined %}
{% set peer_members = hostvars[peer].interfaces | selectattr('lag') | selectattr('lag.name', '==', iface.name) %}
{% if peer_members | iface_peer | reject('eq', inventory_hostname) %}
clag-id {{ (members + peer_members) | cl_clag_id }}
{% endif %}
{% endif %}
{% endif %}
{#- Set allowed VLANs if we are part of the bridge. #}
{% if iface.bridge and iface.mode %}
{% if iface.mode.value == 'access' and iface.untagged_vlan %}
bridge-access {{ iface.untagged_vlan.vid }}
@ -13,7 +30,8 @@ iface {{ iface.name }}
bridge-vids {{ iface.tagged_vlans | map(attribute='vid') | join(' ') }}
{% endif %}
{% endif %}
mtu {{ iface.mtu if iface.mtu else 9216 }}
{#- Addresses. #}
{% for addr in iface.ip_addresses %}
address {{ addr.address }}
{% endfor %}