diff --git a/roles/bird/templates/bird.conf.j2 b/roles/bird/templates/bird.conf.j2 index 41a4cf8..da0c09c 100644 --- a/roles/bird/templates/bird.conf.j2 +++ b/roles/bird/templates/bird.conf.j2 @@ -31,7 +31,7 @@ protocol kernel kernel6 { {% if bird__static_unreachable | ansible.utils.ipv4 %} protocol static unreachable4 { ipv4 { - export all; + import all; }; {% for route in bird__static_unreachable | ansible.utils.ipv4 %} route {{ route }} unreachable; @@ -42,7 +42,7 @@ protocol static unreachable4 { {% if bird__static_unreachable | ansible.utils.ipv6 %} protocol static unreachable6 { ipv6 { - export all; + import all; }; {% for route in bird__static_unreachable | ansible.utils.ipv6 %} route {{ route }} unreachable; @@ -59,10 +59,10 @@ protocol ospf v2 ospf4 { }; area 0 { -{% for network in bird__ospf_stub_networks | ansible.utils.ipv4 %} +{% for network in bird__ospf_stub_networks | ansible.utils.ipv4 %} stubnet {{ network }}; -{% endfor %} -{% for name, iface in bird__ospf_broadcast_interfaces.items() %} +{% endfor %} +{% for name, iface in bird__ospf_broadcast_interfaces.items() %} interface {{ name | enquote }} { type broadcast; hello {{ iface.hello | default(bird__ospf_hello) | int }}; @@ -72,12 +72,12 @@ protocol ospf v2 ospf4 { wait {{ iface.wait | default(bird__ospf_wait) | int }}; dead {{ iface.dead | default(bird__ospf_dead) | int }}; }; -{% endfor %} -{% for name in bird__ospf_stub_interfaces %} +{% endfor %} +{% for name in bird__ospf_stub_interfaces %} interface {{ name | enquote }} { stub; }; -{% endfor %} +{% endfor %} }; } @@ -92,10 +92,10 @@ protocol ospf v3 ospf6 { }; area 0 { -{% for network in bird__ospf_stub_networks | ansible.utils.ipv6 %} +{% for network in bird__ospf_stub_networks | ansible.utils.ipv6 %} stubnet {{ network }}; -{% endfor %} -{% for name, iface in bird__ospf_broadcast_interfaces.items() %} +{% endfor %} +{% for name, iface in bird__ospf_broadcast_interfaces.items() %} interface {{ name | enquote }} { type broadcast; hello {{ iface.hello | default(bird__ospf_hello) | int }}; @@ -105,8 +105,8 @@ protocol ospf v3 ospf6 { wait {{ iface.wait | default(bird__ospf_wait) | int }}; dead {{ iface.dead | default(bird__ospf_dead) | int }}; }; -{% endfor %} -{% for name in bird__ospf_stub_interfaces %} +{% endfor %} +{% for name in bird__ospf_stub_interfaces %} interface {{ name | enquote }} { stub; }; @@ -130,7 +130,7 @@ protocol ospf v3 ospf6 { | ansible.utils.ipaddr(version=version) | first %} -protocol bgp bgp_{{ session.name }}{{ version }} { +protocol bgp bgp{{ version }}_{{ session.name }} { local {{ local_address }} as {{ session.local.as }}; neighbor {{ remote_address }} as {{ session.remote.as }};