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

access: support native VLAN on tagged interfaces for D-Link switches

Browse source
This commit is contained in:
Timotej Lazar 2025-02-10 17:07:32 +01:00
parent f57023b0f0
commit dd30e2ab1c
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/access/tasks/main.yml
View file

@ -19,7 +19,7 @@
ansible_terminal_stderr_re: [] # some errors are not actually errors ansible_terminal_stderr_re: [] # some errors are not actually errors
register: result register: result
# These lines are not displayed by 'sho ru' and always reported as different, so ignore them. # These lines are not displayed by 'sho ru' and always reported as different, so ignore them.
changed_when: result.commands | reject('match', '^(no shutdown|no switchport access vlan|no voice vlan.*|switchport mode access|switchport mode hybrid|interface .*|no enable service web-server https?|no ip dhcp snooping|no ip dhcp snooping trust)$') changed_when: result.commands | reject('match', '^(no shutdown|no switchport access vlan|no switchport trunk native vlan|no voice vlan.*|switchport mode access|switchport mode hybrid|interface .*|no enable service web-server https?|no ip dhcp snooping|no ip dhcp snooping trust)$')
notify: write config notify: write config
- name: Run model-specific tasks - name: Run model-specific tasks

9
roles/access/templates/config-d-link.j2
View file

@ -39,7 +39,14 @@ interface {{ iface.name }}
{%+ elif iface.mode and iface.mode.value == 'tagged' %} {%+ elif iface.mode and iface.mode.value == 'tagged' %}
switchport mode trunk switchport mode trunk
switchport trunk allowed vlan {{ (iface.tagged_vlans or vlans) | map(attribute='vid') | compact_numlist }} {% if iface.untagged_vlan %}
{% set iface_vlans = (iface.tagged_vlans or vlans) + [iface.untagged_vlan] %}
switchport trunk native vlan {{ iface.untagged_vlan.vid }}
{% else %}
{% set iface_vlans = (iface.tagged_vlans or vlans) %}
no switchport trunk native vlan
{% endif %}
switchport trunk allowed vlan {{ iface_vlans | map(attribute='vid') | compact_numlist }}
{%+ else %} {%+ else %}