diff --git a/host_vars/frb1.cph.dk.routers.v6.hessnet.dk.yml b/host_vars/frb1.cph.dk.routers.v6.hessnet.dk.yml index 6e7dd72..93f12b5 100644 --- a/host_vars/frb1.cph.dk.routers.v6.hessnet.dk.yml +++ b/host_vars/frb1.cph.dk.routers.v6.hessnet.dk.yml @@ -16,10 +16,10 @@ bgp_peers: - name: "hessnet_home" template: "peer_hessnet" - peer_asn: "209616" + peer_asn: "64512" neighbor_ip: "2001:678:15c:a00::1" filters: - export: "{ peer_export_default_only(); }" + export: "{ peer_export_dfz_and_default(); }" import: "myroutes_import_export" announce_from_here: true diff --git a/host_vars/vul1.ams.nl.routers.v6.hessnet.dk.yml b/host_vars/vul1.ams.nl.routers.v6.hessnet.dk.yml index 676fc2e..eef2ccf 100644 --- a/host_vars/vul1.ams.nl.routers.v6.hessnet.dk.yml +++ b/host_vars/vul1.ams.nl.routers.v6.hessnet.dk.yml @@ -6,7 +6,7 @@ router_v6_ip: "2001:19f0:5001:256b:5400:02ff:feb0:cd41" bgp_peers: - name: "vultr_v4" template: "peer_vultr_v4" - asn: "64515" + peer_asn: "64515" neighbor_ip: "169.254.169.254" password: !vault | $ANSIBLE_VAULT;1.1;AES256 @@ -18,7 +18,7 @@ bgp_peers: - name: "vultr_v6" template: "peer_vultr_v6" - asn: "64515" + peer_asn: "64515" neighbor_ip: "2001:19f0:ffff::1" password: !vault | $ANSIBLE_VAULT;1.1;AES256 @@ -30,7 +30,7 @@ bgp_peers: - name: "home_router" template: "peer_hessnet" - asn: "209616" + peer_asn: "209616" neighbor_ip: "172.16.12.19" filters: export: "{ peer_export_default_only(); }" diff --git a/inventory b/inventory index 0d306d7..0a0cd20 100644 --- a/inventory +++ b/inventory @@ -6,7 +6,7 @@ archvm2.hosts.v6.hessnet.dk vul1.ams.nl.routers.v6.hessnet.dk [routers_copenhagen] -# frb1.cph.dk.routers.v6.hessnet.dk +frb1.cph.dk.routers.v6.hessnet.dk [routers:children] routers_vultr diff --git a/roles/bird/templates/bird.conf.j2 b/roles/bird/templates/bird.conf.j2 index eb49beb..7935fb0 100644 --- a/roles/bird/templates/bird.conf.j2 +++ b/roles/bird/templates/bird.conf.j2 @@ -172,15 +172,14 @@ protocol direct { protocol kernel { ipv4 { import filter myroutes_import_export; - export none; #filter kernel_export; + export filter kernel_export; }; } protocol kernel kernel6 { - scan time 5; ipv6 { - import none; - export none; #filter kernel_export; + import filter myroutes_import_export; + export filter kernel_export; }; }