rename interfaces

This commit is contained in:
jeltz 2023-03-28 20:36:46 +02:00
parent 9e24c5373e
commit fcb9ac9d17
Signed by: jeltz
GPG key ID: 800882B66C0C3326
5 changed files with 311 additions and 158 deletions

View file

@ -9,31 +9,31 @@
isp-2.rtr.infra.auro.re: 10.203.1.6
bird__router_id: "{{ bird__router_ids[inventory_hostname] }}"
bird__radv_interfaces:
client-0:
client0:
prefix:
- 2a09:6841::/56
domain_search:
- client-0.isp.auro.re
client-1:
- client0.isp.auro.re
client1:
prefix:
- 2a09:6841:0:100::/56
domain_search:
- client-1.isp.auro.re
client-2:
- client1.isp.auro.re
client2:
prefix:
- 2a09:6841:0:200::/56
domain_search:
- client-2.isp.auro.re
client-3:
- client2.isp.auro.re
client3:
prefix:
- 2a09:6841:0:300::/56
domain_search:
- client-3.isp.auro.re
client-4:
- client3.isp.auro.re
client4:
prefix:
- 2a09:6841:0:400::/56
domain_search:
- client-4.isp.auro.re
- client4.isp.auro.re
bird__radv_dns_servers:
- 2a09:6840:128::10:3
bird__asn:
@ -73,13 +73,13 @@
export:
- accept: false
bird__ospf_broadcast_interfaces:
ens19: null
backbone0: null
bird__ospf_stub_interfaces:
- clients-0
- clients-1
- clients-2
- clients-3
- clients-4
- client0
- client1
- client2
- client3
- client4
roles:
- bird
@ -92,15 +92,16 @@
infra-2.rtr.infra.auro.re: 10.203.1.4
bird__router_id: "{{ bird__router_ids[inventory_hostname] }}"
bird__ospf_broadcast_interfaces:
ens19: null
backbone0: null
bird__ospf_stub_interfaces:
- ens20
- ens21
- ens22
- ens23
- enp2s1
- enp2s2
- enp2s3
- monit0
- ap0
- int0
- pub0
- bmc0
- hyperv0
- isp0
- mgmt0
bird__asn:
aurore: 43619
bird__bgp_addresses:

View file

@ -8,16 +8,16 @@
algorithm: hmac-sha512
secret: 99XuJO0ofX3VAnWWlyixWbQ5YTagPfgxyh14IbLNBb3/JzEklkWopvQdj/PXVYbfb/sRyFJBhLexPag4dLh7PA==
dhcpd__interfaces:
- client-0
- client-1
- client-2
- client-3
- client-4
- client0
- client1
- client2
- client3
- client4
dhcpd__dns_servers:
- 10.128.10.3
- 10.128.10.103
dhcpd__domain_search:
- isp.infra.auro.re.
- isp.auro.re.
- auro.re.
dhcpd__subnets:
- network: 100.64.0.0/27
@ -25,35 +25,35 @@
- 100.64.0.1
start: 100.64.0.4
end: 100.64.0.30
domain_name: client-0.isp.auro.re
domain_name: client0.isp.auro.re
failover: true
- network: 100.64.0.32/27
routers:
- 100.64.0.31
start: 100.64.0.33
end: 100.64.0.63
domain_name: client-1.isp.auro.re
domain_name: client1.isp.auro.re
failover: true
- network: 100.64.0.64/27
routers:
- 100.64.0.65
start: 100.64.0.67
end: 100.64.0.95
domain_name: client-2.isp.auro.re
domain_name: client2.isp.auro.re
failover: true
- network: 100.64.0.96/27
routers:
- 100.64.0.97
start: 100.64.0.99
end: 100.64.0.127
domain_name: client-3.isp.auro.re
domain_name: client3.isp.auro.re
failover: true
- network: 100.64.0.128/27
routers:
- 100.64.0.129
start: 100.64.0.131
end: 100.64.0.159
domain_name: client-4.isp.auro.re
domain_name: client4.isp.auro.re
failover: true
dhcpd__failover:
dhcp-1.isp.infra.auro.re: 10.210.1.1

View file

@ -55,349 +55,349 @@
- 2a09:6840:129::10:102/56
- 10.129.10.102/16
dns-1.int.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:3/56
- 10.128.10.3/16
#gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
int0:
addresses:
- 2a09:6840:206:0:2::1/56
- 10.206.0.2/16
gateways: "{{ ifupdown2__gateways.int }}"
dns-2.int.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:103/56
- 10.128.10.103/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
int0:
addresses:
- 2a09:6840:206:0:3::1/56
- 10.206.0.3/16
ssh-1.mgmt.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:1/56
- 10.128.10.1/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
pub0:
addresses:
- 2a09:6840:207:1:2::1/56
- 45.66.108.2/16
ens20:
mgmt0:
addresses:
- 2a09:6840:211:1:1::1/56
- 10.211.1.1/16
ssh-2.mgmt.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:101/56
- 10.128.10.101/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
pub0:
- 2a09:6840:207:1:3::1/56
- 45.66.108.3/16
ens20:
mgmt0:
addresses:
- 2a09:6840:211:1:2::1/56
- 10.211.1.2/16
infra-1.rtr.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:4/56
- 10.128.10.4/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
backbone0:
addresses:
- 2a09:6840:203:1:3::1/56
- 10.203.1.3/16
ens20:
monit0:
ipv6_addrgen: false
ens21:
ap0:
ipv6_addrgen: false
ens22:
int0:
ipv6_addrgen: false
ens23:
pub0:
ipv6_addrgen: false
enp2s1:
bmc0:
ipv6_addrgen: false
enp2s2:
hyperv0:
ipv6_addrgen: false
enp2s3:
isp0:
ipv6_addrgen: false
enp2s4:
mgmt0:
ipv6_addrgen: false
infra-2.rtr.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:104/56
- 10.128.10.104/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
backbone0:
addresses:
- 2a09:6840:203:4::1/64
- 10.203.1.4/16
ens20:
monit0:
ipv6_addrgen: false
ens21:
ap0:
ipv6_addrgen: false
ens22:
int0:
ipv6_addrgen: false
ens23:
pub0:
ipv6_addrgen: false
enp2s1:
bmc0:
ipv6_addrgen: false
enp2s2:
hyperv0:
ipv6_addrgen: false
enp2s3:
isp0:
ipv6_addrgen: false
enp2s4:
mgmt0:
ipv6_addrgen: false
isp-1.rtr.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:5/56
- 10.128.10.5/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
backbone0:
addresses:
- 2a09:6840:203:1:5::1/56
- 10.203.1.5/16
ens20:
trunk0:
ipv6_addrgen: false
clients:
clients0:
bridge_vlan_aware: true
bridge_ports:
- ens20
- trunk0
bridge_vids:
- 1000-1004
bridge_disable_pvid: true
ipv6_addrgen: false
client-0:
client0:
vlan_id: 1000
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
client-1:
client1:
vlan_id: 1001
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
client-2:
client2:
vlan_id: 1002
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
client-3:
client3:
vlan_id: 1003
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
client-4:
client4:
vlan_id: 1004
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
isp-2.rtr.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:105/56
- 10.128.10.105/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
backbone0:
addresses:
- 2a09:6840:203:1:6::1/56
- 10.203.1.6/16
ens20:
trunk0:
ipv6_addrgen: false
clients:
clients0:
bridge_vlan_aware: true
bridge_ports:
- ens20
- trunk0
bridge_vids:
- 1000-1004
bridge_disable_pvid: true
ipv6_addrgen: false
client-0:
client0:
vlan_id: 1000
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
client-1:
client1:
vlan_id: 1001
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
client-2:
client2:
vlan_id: 1002
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
client-3:
client3:
vlan_id: 1003
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
client-4:
client4:
vlan_id: 1004
vlan_raw_device: clients
vlan_raw_device: clients0
ipv6_addrgen: false
dhcp-1.isp.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:6/56
- 10.128.10.6/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
isp0:
addresses:
- 2a09:6840:210:1:1::1/56
- 10.210.1.1/16
ens20: null
clients:
trunk0: null
clients0:
bridge_vlan_aware: true
bridge_ports:
- ens20
- trunk0
bridge_vids:
- 1000-1004
bridge_disable_pvid: true
ipv6_addrgen: false
client-0:
client0:
addresses:
- 100.64.0.2/27
vlan_id: 1000
vlan_raw_device: clients
client-1:
vlan_raw_device: clients0
client1:
addresses:
- 100.64.0.34/27
vlan_id: 1001
vlan_raw_device: clients
client-2:
vlan_raw_device: clients0
client2:
addresses:
- 100.64.0.66/27
vlan_id: 1002
vlan_raw_device: clients
client-3:
vlan_raw_device: clients0
client3:
addresses:
- 100.64.0.98/27
vlan_id: 1003
vlan_raw_device: clients
client-4:
vlan_raw_device: clients0
client4:
addresses:
- 100.64.0.130/27
vlan_id: 1004
vlan_raw_device: clients
vlan_raw_device: clients0
dhcp-2.isp.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:106/56
- 10.128.10.106/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
isp0:
addresses:
- 2a09:6840:210:1:2::1/56
- 10.210.1.2/16
ens20: null
clients:
trunk0: null
clients0:
bridge_vlan_aware: true
bridge_ports:
- ens20
- trunk0
bridge_vids:
- 1000-1004
bridge_disable_pvid: true
ipv6_addrgen: false
client-0:
client0:
addresses:
- 100.64.0.3/27
vlan_id: 1000
vlan_raw_device: clients
client-1:
vlan_raw_device: clients0
client1:
addresses:
- 100.64.0.35/27
vlan_id: 1001
vlan_raw_device: clients
client-2:
vlan_raw_device: clients0
client2:
addresses:
- 100.64.0.67/27
vlan_id: 1002
vlan_raw_device: clients
client-3:
vlan_raw_device: clients0
client3:
addresses:
- 100.64.0.99/27
vlan_id: 1003
vlan_raw_device: clients
client-4:
vlan_raw_device: clients0
client4:
addresses:
- 100.64.0.131/27
vlan_id: 1004
vlan_raw_device: clients
vlan_raw_device: clients0
radius-1.isp.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:7/56
- 10.128.10.7/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
isp0:
addresses:
- 2a09:6840:210:1:1::1/56
- 10.210.1.1/16
- 10.210.1.3/16
radius-2.isp.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:107/56
- 10.128.10.107/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
isp0:
addresses:
- 2a09:6840:210:1:2::1/56
- 10.210.1.4/16
ldap-1.int.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:8/56
- 10.128.10.8/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
int0:
addresses:
- 2a09:6840:206:1:3::1/56
- 10.206.1.3/16
ldap-2.int.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:108/56
- 10.128.10.108/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
int0:
addresses:
- 2a09:6840:206:1:4::1/56
- 10.206.1.4/16
ntp-1.int.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:9/56
- 10.128.10.9/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
int0:
addresses:
- 2a09:6840:206:1:5::1/56
- 10.206.1.5/16
ntp-2.int.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:109/56
- 10.128.10.109/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
int0:
addresses:
- 2a09:6840:206:1:6::1/56
- 10.206.1.6/16
prometheus-1.monit.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:10/56
- 10.128.10.10/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
monit0:
addresses:
- 2a09:6840:204:1:1::1/56
- 10.204.1.1/16
prometheus-2.monit.infra.auro.re:
ens18:
adm0:
addresses:
- 2a09:6840:128::10:110/56
- 10.128.10.110/16
gateways: "{{ ifupdown2__gateways.adm }}"
ens19:
monit0:
addresses:
- 2a09:6840:204:1:2::1/56
- 10.204.1.2/16

View file

@ -5,25 +5,25 @@
- isp-2.rtr.infra.auro.re
vars:
keepalived__virtual_router_id: 80
keepalived__interface: ens19
keepalived__interface: backbone0
keepalived__virtual_addresses:
client-0:
client0:
- 100.64.0.1/27
- 2a09:6841::1/56
- fe80::1/10
client-1:
client1:
- 100.64.0.33/27
- 2a09:6841:0:100::1/56
- fe80::1/10
client-2:
client2:
- 100.64.0.65/27
- 2a09:6841:0:200::1/56
- fe80::1/10
client-3:
client3:
- 100.64.0.97/27
- 2a09:6841:0:300::1/56
- fe80::1/10
client-4:
client4:
- 100.64.0.129/27
- 2a09:6841:0:400::1/56
- fe80::1/10
@ -55,37 +55,37 @@
- infra-2.rtr.infra.auro.re
vars:
keepalived__virtual_router_id: 82
keepalived__interface: ens19
keepalived__interface: backbone0
keepalived__virtual_addresses:
ens20:
monit0:
- 10.204.0.1/16
- 2a09:6840:204::1/56
- fe80::1/10
ens21:
ap0:
- 10.205.0.1/16
- 2a09:6840:205::1/56
- fe80::1/10
ens22:
int0:
- 10.206.0.1/16
- 2a09:6840:206::1/56
- fe80::1/10
ens23:
pub0:
- 10.207.0.1/16
- 2a09:6840:207::1/56
- fe80::1/10
enp2s1:
bmc0:
- 10.208.0.1/16
- 2a09:6840:208::1/56
- fe80::1/10
enp2s2:
hyperv0:
- 10.209.0.1/16
- 2a09:6840:209::1/56
- fe80::1/10
enp2s3:
isp0:
- 10.210.0.1/16
- 2a09:6840:210::1/56
- fe80::1/10
enp2s4:
mgmt0:
- 10.211.0.1/16
- 2a09:6840:211::1/56
- fe80::1/10

View file

@ -3,6 +3,24 @@
- hosts:
- edge-1.rtr.infra.auro.re
- edge-2.rtr.infra.auro.re
- ssh-1.mgmt.infra.auro.re
- ssh-2.mgmt.infra.auro.re
- dns-1.int.infra.auro.re
- dns-2.int.infra.auro.re
- infra-1.rtr.infra.auro.re
- infra-2.rtr.infra.auro.re
- isp-1.rtr.infra.auro.re
- isp-2.rtr.infra.auro.re
- dhcp-1.isp.infra.auro.re
- dhcp-2.isp.infra.auro.re
- radius-1.isp.infra.auro.re
- radius-2.isp.infra.auro.re
- ldap-1.int.infra.auro.re
- ldap-2.int.infra.auro.re
- ntp-1.int.infra.auro.re
- ntp-2.int.infra.auro.re
- prometheus-1.monit.infra.auro.re
- prometheus-2.monit.infra.auro.re
vars:
systemd_link__hosts:
edge-1.rtr.infra.auro.re:
@ -35,6 +53,140 @@
mac: 04:00:00:45:FA:E6
router0:
mac: 04:00:00:AD:D7:71
ssh-1.mgmt.infra.auro.re:
adm0:
mac: 02:00:00:a3:49:20
pub0:
mac: 02:00:00:27:ea:9d
mgmt0:
mac: 02:00:00:0f:ac:75
ssh-2.mgmt.infra.auro.re:
adm0:
mac: 04:00:00:98:c2:10
pub0:
mac: 04:00:00:65:cc:52
mgmt0:
mac: 04:00:00:3c:67:08
dns-1.int.infra.auro.re:
adm0:
mac: 02:00:00:6c:4b:89
int0:
mac: 02:00:00:9f:d9:f9
dns-2.int.infra.auro.re:
adm0:
mac: 04:00:00:2a:6e:be
int0:
mac: 04:00:00:3c:c0:5a
infra-1.rtr.infra.auro.re:
adm0:
mac: 02:00:00:f0:8a:dd
backbone0:
mac: 02:00:00:f8:93:22
monit0:
mac: 02:00:00:da:97:7f
ap0:
mac: 02:00:00:8c:c5:bf
int0:
mac: 02:00:00:75:40:3e
pub0:
mac: 02:00:00:ca:e8:d1
bmc0:
mac: 02:00:00:47:d1:b9
hyperv0:
mac: 02:00:00:b3:35:e7
isp0:
mac: 02:00:00:6b:53:14
mgmt0:
mac: 02:00:00:32:86:60
infra-2.rtr.infra.auro.re:
adm0:
mac: 04:00:00:d3:03:53
backbone0:
mac: 04:00:00:46:ba:f9
monit0:
mac: 04:00:00:72:0b:2d
ap0:
mac: 04:00:00:ee:42:0f
int0:
mac: 04:00:00:21:fd:d0
pub0:
mac: 04:00:00:2e:5b:16
bmc0:
mac: 04:00:00:bb:5a:a6
hyperv0:
mac: 04:00:00:0b:2b:82
isp0:
mac: 04:00:00:f4:4c:5d
mgmt0:
mac: 04:00:00:1d:0e:83
isp-1.rtr.infra.auro.re:
adm0:
mac: 02:00:00:D8:37:45
backbone0:
mac: 02:00:00:BF:10:4C
trunk0:
mac: 02:00:00:E9:BA:15
isp-2.rtr.infra.auro.re:
adm0:
mac: 04:00:00:85:C3:5D
backbone0:
mac: 04:00:00:FE:2D:67
trunk0:
mac: 04:00:00:D8:F5:4D
dhcp-1.isp.infra.auro.re:
adm0:
mac: 02:00:00:17:61:5b
isp0:
mac: 02:00:00:c6:3f:6f
trunk0:
mac: 02:00:00:b1:8d:d6
dhcp-2.isp.infra.auro.re:
adm0:
mac: 04:00:00:0c:f1:42
isp0:
mac: 04:00:00:8c:d1:36
trunk0:
mac: 04:00:00:33:2c:3c
radius-1.isp.infra.auro.re:
adm0:
mac: 02:00:00:4f:35:12
isp0:
mac: 02:00:00:6a:3e:f4
radius-2.isp.infra.auro.re:
adm0:
mac: 04:00:00:96:54:a6
isp0:
mac: 04:00:00:29:6d:c9
ldap-1.int.infra.auro.re:
adm0:
mac: 02:00:00:38:c2:52
int0:
mac: 02:00:00:fe:a8:54
ldap-2.int.infra.auro.re:
adm0:
mac: 04:00:00:f7:1c:47
int0:
mac: 04:00:00:e4:83:d2
ntp-1.int.infra.auro.re:
adm0:
mac: 02:00:00:e0:26:2e
int0:
mac: 02:00:00:74:71:83
ntp-2.int.infra.auro.re:
adm0:
mac: 04:00:00:08:83:2b
int0:
mac: 04:00:00:31:be:50
prometheus-1.monit.infra.auro.re:
adm0:
mac: 02:00:00:66:33:9d
monit0:
mac: 02:00:00:a8:6b:51
prometheus-2.monit.infra.auro.re:
adm0:
mac: 04:00:00:3d:c6:a1
monit0:
mac: 04:00:00:a6:93:5a
systemd_link__links: "{{ systemd_link__hosts[inventory_hostname] }}"
roles:
- systemd_link