bird + ifupdown2: fix IP addrs + iBGP for isp-{1,2}

This commit is contained in:
jeltz 2023-01-07 09:12:44 +01:00
parent 9f850aa4da
commit 48deabba50
Signed by: jeltz
GPG key ID: 800882B66C0C3326
2 changed files with 94 additions and 22 deletions

View file

@ -5,8 +5,8 @@
- isp-2.rtr.infra.auro.re - isp-2.rtr.infra.auro.re
vars: vars:
bird__router_ids: bird__router_ids:
isp-1.rtr.infra.auro.re: 10.203.0.5 isp-1.rtr.infra.auro.re: 10.203.1.5
isp-2.rtr.infra.auro.re: 10.203.0.6 isp-2.rtr.infra.auro.re: 10.203.1.6
bird__router_id: "{{ bird__router_ids[inventory_hostname] }}" bird__router_id: "{{ bird__router_ids[inventory_hostname] }}"
bird__radv_interfaces: bird__radv_interfaces:
client-0: client-0:
@ -36,6 +36,42 @@
- client-4.isp.auro.re - client-4.isp.auro.re
bird__radv_dns_servers: bird__radv_dns_servers:
- 2a09:6840:128::10:3 - 2a09:6840:128::10:3
bird__asn:
aurore: 43619
bird__bgp_addresses:
isp-1.rtr.infra.auro.re:
- 2a09:6840:203:1:5::1
- 10.203.1.5
isp-2.rtr.infra.auro.re:
- 2a09:6840:203:1:5::1
- 10.203.1.5
bird__bgp_sessions:
- name: edge1
local:
address: "{{ bird__bgp_addresses[inventory_hostname] }}"
as: "{{ bird__asn.aurore }}"
remote:
address:
- 2a09:6840:203:1:1::1
- 10.203.1.1
as: "{{ bird__asn.aurore }}"
import:
- accept: true
export:
- accept: false
- name: edge2
local:
address: "{{ bird__bgp_addresses[inventory_hostname] }}"
as: "{{ bird__asn.aurore }}"
remote:
address:
- 2a09:6840:203:1:2::1
- 10.203.1.2
as: "{{ bird__asn.aurore }}"
import:
- accept: true
export:
- accept: false
bird__ospf_broadcast_interfaces: bird__ospf_broadcast_interfaces:
ens19: null ens19: null
bird__ospf_stub_interfaces: bird__ospf_stub_interfaces:
@ -52,8 +88,8 @@
- infra-2.rtr.infra.auro.re - infra-2.rtr.infra.auro.re
vars: vars:
bird__router_ids: bird__router_ids:
infra-1.rtr.infra.auro.re: 10.203.0.3 infra-1.rtr.infra.auro.re: 10.203.1.3
infra-2.rtr.infra.auro.re: 10.203.0.4 infra-2.rtr.infra.auro.re: 10.203.1.4
bird__router_id: "{{ bird__router_ids[inventory_hostname] }}" bird__router_id: "{{ bird__router_ids[inventory_hostname] }}"
bird__ospf_broadcast_interfaces: bird__ospf_broadcast_interfaces:
ens19: null ens19: null
@ -81,8 +117,8 @@
as: "{{ bird__asn.aurore }}" as: "{{ bird__asn.aurore }}"
remote: remote:
address: address:
- 2a09:6840:203:0:1::1 - 2a09:6840:203:1:1::1
- 10.203.0.1 - 10.203.1.1
as: "{{ bird__asn.aurore }}" as: "{{ bird__asn.aurore }}"
import: import:
- accept: true - accept: true
@ -94,8 +130,8 @@
as: "{{ bird__asn.aurore }}" as: "{{ bird__asn.aurore }}"
remote: remote:
address: address:
- 2a09:6840:203:0:2::1 - 2a09:6840:203:1:2::1
- 10.203.0.2 - 10.203.1.2
as: "{{ bird__asn.aurore }}" as: "{{ bird__asn.aurore }}"
import: import:
- accept: true - accept: true
@ -109,8 +145,8 @@
- edge-2.rtr.infra.auro.re - edge-2.rtr.infra.auro.re
vars: vars:
bird__router_ids: bird__router_ids:
edge-1.rtr.infra.auro.re: 10.203.0.1 edge-1.rtr.infra.auro.re: 10.203.1.1
edge-2.rtr.infra.auro.re: 10.203.0.2 edge-2.rtr.infra.auro.re: 10.203.1.2
bird__asn: bird__asn:
aurore: 43619 aurore: 43619
crans: 204515 crans: 204515
@ -155,11 +191,11 @@
bird__router_id: "{{ bird__router_ids[inventory_hostname] }}" bird__router_id: "{{ bird__router_ids[inventory_hostname] }}"
bird__bgp_addresses: bird__bgp_addresses:
edge-1.rtr.infra.auro.re: edge-1.rtr.infra.auro.re:
- 2a09:6840:203:0:1::1 - 2a09:6840:203:1:1::1
- 10.203.0.1 - 10.203.1.1
edge-2.rtr.infra.auro.re: edge-2.rtr.infra.auro.re:
- 2a09:6840:203:0:2::1 - 2a09:6840:203:1:2::1
- 10.203.0.2 - 10.203.1.2
bird__bgp_sessions: bird__bgp_sessions:
- name: edge - name: edge
local: local:
@ -212,6 +248,42 @@
- zayo - zayo
accept: true accept: true
- accept: false - accept: false
- name: isp1
local:
address: "{{ bird__bgp_addresses[inventory_hostname] }}"
as: "{{ bird__asn.aurore }}"
remote:
address:
- 2a09:6840:203:1:5::1
- 10.203.1.5
as: "{{ bird__asn.aurore }}"
import:
- accept: false
export:
- bgp_proto:
- crans
- viarezo
- zayo
accept: true
- accept: false
- name: isp2
local:
address: "{{ bird__bgp_addresses[inventory_hostname] }}"
as: "{{ bird__asn.aurore }}"
remote:
address:
- 2a09:6840:203:1:6::1
- 10.203.1.6
as: "{{ bird__asn.aurore }}"
import:
- accept: false
export:
- bgp_proto:
- crans
- viarezo
- zayo
accept: true
- accept: false
- name: zayo - name: zayo
local: local:
address: address:

View file

@ -26,8 +26,8 @@
forward: true forward: true
ens22: ens22:
addresses: addresses:
- 2a09:6840:203:0:1::1/56 - 2a09:6840:203:1:1::1/56
- 10.203.0.1/16 - 10.203.1.1/16
forward: true forward: true
edge-2.rtr.infra.auro.re: edge-2.rtr.infra.auro.re:
ens18: ens18:
@ -46,8 +46,8 @@
forward: true forward: true
ens22: ens22:
addresses: addresses:
- 2a09:6840:203:0:2::1/56 - 2a09:6840:203:1:2::1/56
- 10.203.0.2/16 - 10.203.1.2/16
forward: true forward: true
dns-1.int.infra.auro.re: dns-1.int.infra.auro.re:
ens18: ens18:
@ -157,8 +157,8 @@
gateways: "{{ ifupdown2__gateways.adm }}" gateways: "{{ ifupdown2__gateways.adm }}"
ens19: ens19:
addresses: addresses:
- 2a09:6840:203:0:5::1/56 - 2a09:6840:203:1:5::1/56
- 10.203.0.5/16 - 10.203.1.5/16
forward: true forward: true
ens20: ens20:
ipv6_addrgen: false ipv6_addrgen: false
@ -204,8 +204,8 @@
gateways: "{{ ifupdown2__gateways.adm }}" gateways: "{{ ifupdown2__gateways.adm }}"
ens19: ens19:
addresses: addresses:
- 2a09:6840:203:0:5::1/56 - 2a09:6840:203:1:6::1/56
- 10.203.0.5/16 - 10.203.1.6/16
forward: true forward: true
ens20: ens20:
ipv6_addrgen: false ipv6_addrgen: false