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

[docker-bgp]: Use address-family ipv6 for ipv6 vlan addresses #692

Merged
merged 6 commits into from
Jun 11, 2017
Merged

[docker-bgp]: Use address-family ipv6 for ipv6 vlan addresses #692

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ea6318
Fix SAI submodule id
pavel-shirshov May 30, 2017
991124c
Merge remote-tracking branch 'upstream/master'
pavel-shirshov May 30, 2017
219c4d0
Merge remote-tracking branch 'upstream/master'
pavel-shirshov May 31, 2017
1db3b3d
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 1, 2017
ebb58b6
Merge remote-tracking branch 'upstream/master'
pavel-shirshov Jun 10, 2017
f608782
Fix bgpd template. Use v6 address family for vlan ipv6 addr
pavel-shirshov Jun 10, 2017
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
6 changes: 6 additions & 0 deletions dockers/docker-fpm-frr/bgpd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ router bgp {{ minigraph_bgp_asn }}
{% endblock bgp_init %}
{% block vlan_advertisement %}
{% for vlan_interface in minigraph_vlan_interfaces %}
{% if vlan_interface['addr'] | ipv4 %}
network {{ vlan_interface['subnet'] }}
{% elif vlan_interface['addr'] | ipv6 %}
address-family ipv6
network {{ vlan_interface['subnet'] }}
exit-address-family
{% endif %}
{% endfor %}
{% endblock vlan_advertisement %}
{% block bgp_sessions %}
Expand Down