diff --git a/playbooks/bird.yml b/playbooks/bird.yml index 3dd2183..199657f 100755 --- a/playbooks/bird.yml +++ b/playbooks/bird.yml @@ -392,11 +392,12 @@ # accept: true # - accept: false bird__ospf_broadcast_interfaces: - ens22: null + backbone0: null bird__ospf_stub_interfaces: - - ens19 - - ens20 - - ens21 + - crans0 + - zayo0 + - rezel0 + - viarezo0 bird__static_unreachable: "{{ bird__orig_prefixes.aurore }}" roles: - bird diff --git a/playbooks/ifupdown2.yml b/playbooks/ifupdown2.yml index 79ad5ce..0dc2bf4 100755 --- a/playbooks/ifupdown2.yml +++ b/playbooks/ifupdown2.yml @@ -13,51 +13,47 @@ # TODO: netbox ifupdown2__hosts: edge-1.rtr.infra.auro.re: - ens18: + adm0: addresses: - 2a09:6840:128::10:2/56 - 10.128.10.2/16 - ens19: + crans0: ipv6_addrgen: false - ens20: + zayo0: ipv6_addrgen: false - ens21: + rezel0: ipv6_addrgen: false - ens22: + backbone0: addresses: - 2a09:6840:203:1:1::1/56 - 10.203.1.1/16 - ens23: + viarezo0: ipv6_addrgen: false - enp2s1: + router0: addresses: - 2a09:6840:129::10:2/56 - 10.129.10.2/16 - enp2s2: - ipv6_addrgen: false edge-2.rtr.infra.auro.re: - ens18: + adm0: addresses: - 2a09:6840:128::10:102/56 - 10.128.10.102/16 - ens19: + crans0: ipv6_addrgen: false - ens20: + zayo0: ipv6_addrgen: false - ens21: + rezel0: ipv6_addrgen: false - ens22: + backbone0: addresses: - 2a09:6840:203:1:2::1/56 - 10.203.1.2/16 - ens23: + viarezo0: ipv6_addrgen: false - enp2s1: + router0: addresses: - 2a09:6840:129::10:102/56 - 10.129.10.102/16 - enp2s2: - ipv6_addrgen: false dns-1.int.infra.auro.re: ens18: addresses: diff --git a/playbooks/ip_forward.yml b/playbooks/ip_forward.yml index ae6e46b..d95dfff 100755 --- a/playbooks/ip_forward.yml +++ b/playbooks/ip_forward.yml @@ -3,6 +3,8 @@ - hosts: - edge-1.rtr.infra.auro.re - edge-2.rtr.infra.auro.re + - infra-1.rtr.infra.auro.re + - infra-2.rtr.infra.auro.re roles: - ip_forward ... diff --git a/playbooks/keepalived.yml b/playbooks/keepalived.yml index 254c361..a69574f 100755 --- a/playbooks/keepalived.yml +++ b/playbooks/keepalived.yml @@ -36,13 +36,13 @@ - edge-2.rtr.infra.auro.re vars: keepalived__virtual_router_id: 81 - keepalived__interface: ens22 + keepalived__interface: backbone0 keepalived__virtual_addresses: - ens19: + crans0: - 185.230.79.254/29 - 2a0c:700:28::2/64 - fe80::1/10 - ens20: + zayo0: - 2001:1b48:2:103::d7:2/126 - 83.167.52.69/31 - fe80::1/10 diff --git a/playbooks/systemd_link.yml b/playbooks/systemd_link.yml index 621528d..16f2f61 100755 --- a/playbooks/systemd_link.yml +++ b/playbooks/systemd_link.yml @@ -1,13 +1,41 @@ #!/usr/bin/env ansible-playbook --- - hosts: + - edge-1.rtr.infra.auro.re - edge-2.rtr.infra.auro.re vars: - systemd_link__links: - viarezo0: - enabled: false - vlan123: - mac: 04:00:00:d8:d6:a2 + systemd_link__hosts: + edge-1.rtr.infra.auro.re: + adm0: + mac: 02:00:00:9E:3E:21 + crans0: + mac: 02:00:00:A2:7C:68 + zayo0: + mac: 02:00:00:35:89:82 + rezel0: + mac: 02:00:00:8F:4A:AD + backbone0: + mac: 02:00:00:1C:3A:2E + viarezo0: + mac: 02:00:00:ED:70:64 + router0: + mac: 02:00:00:5A:17:7C + edge-2.rtr.infra.auro.re: + adm0: + mac: 04:00:00:F5:69:B9 + crans0: + mac: 04:00:00:CF:E1:D0 + zayo0: + mac: 04:00:00:67:7B:12 + rezel0: + mac: 04:00:00:C6:05:B7 + backbone0: + mac: 04:00:00:DE:22:E6 + viarezo0: + mac: 04:00:00:45:FA:E6 + router0: + mac: 04:00:00:AD:D7:71 + systemd_link__links: "{{ systemd_link__hosts[inventory_hostname] }}" roles: - systemd_link ...