diff --git a/bird-babel.j2 b/bird-babel.j2 index 60b0908..caef34f 100644 --- a/bird-babel.j2 +++ b/bird-babel.j2 @@ -3,8 +3,8 @@ # the network. protocol direct { ipv4 { - import where net ~ [ 172.20.0.0/16+, 172.31.0.0/16+, 10.0.0.0/8+ ]; - export where net ~ [ 172.20.0.0/16+, 172.31.0.0/16+, 10.0.0.0/8+ ]; + import where net ~ [ 172.20.0.0/14+, 172.31.0.0/16+, 10.0.0.0/8+ ]; + export where net ~ [ 172.20.0.0/14+, 172.31.0.0/16+, 10.0.0.0/8+ ]; }; ipv6 { import where net ~ [ fd00::/8+ ]; diff --git a/int-bgp.j2 b/int-bgp.j2 index f6121a1..d0cdb52 100644 --- a/int-bgp.j2 +++ b/int-bgp.j2 @@ -6,7 +6,7 @@ template bgp intpeers { import where source = RTS_BGP && is_valid_network() && !is_self_net(); export where source = RTS_BGP && is_valid_network() && !is_self_net(); next hop self; - add paths yes; +# add paths yes; import table; }; {% endif %} @@ -15,7 +15,7 @@ template bgp intpeers { import where source = RTS_BGP && is_valid_network_v6() && !is_self_net_v6(); export where source = RTS_BGP && is_valid_network_v6() && !is_self_net_v6(); next hop self; - add paths yes; +# add paths yes; import table; }; } diff --git a/setup.yml b/setup.yml index 3523ed0..20b7114 100644 --- a/setup.yml +++ b/setup.yml @@ -76,6 +76,7 @@ name: bird.service enabled: true state: reloaded + throttle: 1 when: ansible_service_mgr == 'systemd' - name: add sysctl files ansible.builtin.copy: diff --git a/sysctl-dn42.conf b/sysctl-dn42.conf index 6d7ff1e..a85fd95 100644 --- a/sysctl-dn42.conf +++ b/sysctl-dn42.conf @@ -3,5 +3,5 @@ net.ipv4.conf.default.forwarding=1 net.ipv6.conf.all.forwarding=1 net.ipv6.conf.default.forwarding=1 net.ipv4.ip_forward=1 -net.ipv4.conf.all.rp_filter=1 -net.ipv4.conf.default.rp_filter=1 +net.ipv4.conf.all.rp_filter=0 +net.ipv4.conf.default.rp_filter=0