From 67ac2a7618d125acb876af01884d4e3a56c42433 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Sat, 1 Apr 2023 21:53:48 +0200 Subject: [PATCH] =?UTF-8?q?rename=20hyperv=20=E2=86=92=20pve=20+=20backbon?= =?UTF-8?q?e=20=E2=86=92=20back?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- playbooks/bird.yml | 13 +++++++++---- playbooks/ifupdown2.yml | 12 ++++++------ playbooks/keepalived.yml | 6 +++--- playbooks/systemd_link.yml | 20 ++++++++++++++------ 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/playbooks/bird.yml b/playbooks/bird.yml index 1543343..3b72b18 100755 --- a/playbooks/bird.yml +++ b/playbooks/bird.yml @@ -73,7 +73,7 @@ export: - accept: false bird__ospf_broadcast_interfaces: - backbone0: null + back0: null bird__ospf_stub_interfaces: - client0 - client1 @@ -92,14 +92,14 @@ infra-2.rtr.infra.auro.re: 10.203.1.4 bird__router_id: "{{ bird__router_ids[inventory_hostname] }}" bird__ospf_broadcast_interfaces: - backbone0: null + back0: null bird__ospf_stub_interfaces: - monit0 - ap0 - int0 - pub0 - bmc0 - - hyperv0 + - pve0 - isp0 - mgmt0 bird__asn: @@ -153,10 +153,12 @@ crans: 204515 zayo: 8218 viarezo: 212424 + rezel: 199116 bird__orig_prefixes: aurore: - 45.66.108.0/22 - - 2a09:6840::/29 + - 2a09:6840::/32 + - 2a09:6841::/32 crans: - 185.230.76.0/22 - 2a0c:700::/32 @@ -164,6 +166,9 @@ - 138.195.144.0/20 - 192.159.121.0/24 - 2a0c:b641:2f0::/44 + rezel: + - 137.194.8.0/22 + - 2a09:6847::/32 martians: - 10.0.0.0/8 - 172.16.0.0/12 diff --git a/playbooks/ifupdown2.yml b/playbooks/ifupdown2.yml index 283a600..a8c58b9 100755 --- a/playbooks/ifupdown2.yml +++ b/playbooks/ifupdown2.yml @@ -107,7 +107,7 @@ - 2a09:6840:128::10:4/56 - 10.128.10.4/16 gateways: "{{ ifupdown2__gateways.adm }}" - backbone0: + back0: addresses: - 2a09:6840:203:1:3::1/56 - 10.203.1.3/16 @@ -121,7 +121,7 @@ ipv6_addrgen: false bmc0: ipv6_addrgen: false - hyperv0: + pve0: ipv6_addrgen: false isp0: ipv6_addrgen: false @@ -133,7 +133,7 @@ - 2a09:6840:128::10:104/56 - 10.128.10.104/16 gateways: "{{ ifupdown2__gateways.adm }}" - backbone0: + back0: addresses: - 2a09:6840:203:4::1/64 - 10.203.1.4/16 @@ -147,7 +147,7 @@ ipv6_addrgen: false bmc0: ipv6_addrgen: false - hyperv0: + pve0: ipv6_addrgen: false isp0: ipv6_addrgen: false @@ -159,7 +159,7 @@ - 2a09:6840:128::10:5/56 - 10.128.10.5/16 gateways: "{{ ifupdown2__gateways.adm }}" - backbone0: + back0: addresses: - 2a09:6840:203:1:5::1/56 - 10.203.1.5/16 @@ -199,7 +199,7 @@ - 2a09:6840:128::10:105/56 - 10.128.10.105/16 gateways: "{{ ifupdown2__gateways.adm }}" - backbone0: + back0: addresses: - 2a09:6840:203:1:6::1/56 - 10.203.1.6/16 diff --git a/playbooks/keepalived.yml b/playbooks/keepalived.yml index 0a05b14..1511679 100755 --- a/playbooks/keepalived.yml +++ b/playbooks/keepalived.yml @@ -5,7 +5,7 @@ - isp-2.rtr.infra.auro.re vars: keepalived__virtual_router_id: 80 - keepalived__interface: backbone0 + keepalived__interface: back0 keepalived__virtual_addresses: client0: - 100.64.0.1/27 @@ -55,7 +55,7 @@ - infra-2.rtr.infra.auro.re vars: keepalived__virtual_router_id: 82 - keepalived__interface: backbone0 + keepalived__interface: back0 keepalived__virtual_addresses: monit0: - 10.204.0.1/16 @@ -77,7 +77,7 @@ - 10.208.0.1/16 - 2a09:6840:208::1/56 - fe80::1/10 - hyperv0: + pve0: - 10.209.0.1/16 - 2a09:6840:209::1/56 - fe80::1/10 diff --git a/playbooks/systemd_link.yml b/playbooks/systemd_link.yml index 9c52c39..4557e39 100755 --- a/playbooks/systemd_link.yml +++ b/playbooks/systemd_link.yml @@ -80,8 +80,10 @@ infra-1.rtr.infra.auro.re: adm0: mac: 02:00:00:f0:8a:dd - backbone0: + back0: mac: 02:00:00:f8:93:22 + backbone0: + enabled: false monit0: mac: 02:00:00:da:97:7f ap0: @@ -92,7 +94,7 @@ mac: 02:00:00:ca:e8:d1 bmc0: mac: 02:00:00:47:d1:b9 - hyperv0: + pve0: mac: 02:00:00:b3:35:e7 isp0: mac: 02:00:00:6b:53:14 @@ -101,8 +103,10 @@ infra-2.rtr.infra.auro.re: adm0: mac: 04:00:00:d3:03:53 - backbone0: + back0: mac: 04:00:00:46:ba:f9 + backbone0: + enabled: false monit0: mac: 04:00:00:72:0b:2d ap0: @@ -113,7 +117,7 @@ mac: 04:00:00:2e:5b:16 bmc0: mac: 04:00:00:bb:5a:a6 - hyperv0: + pve0: mac: 04:00:00:0b:2b:82 isp0: mac: 04:00:00:f4:4c:5d @@ -122,15 +126,19 @@ isp-1.rtr.infra.auro.re: adm0: mac: 02:00:00:D8:37:45 - backbone0: + back0: mac: 02:00:00:BF:10:4C + backbone0: + enabled: false trunk0: mac: 02:00:00:E9:BA:15 isp-2.rtr.infra.auro.re: adm0: mac: 04:00:00:85:C3:5D - backbone0: + back0: mac: 04:00:00:FE:2D:67 + backbone0: + enabled: false trunk0: mac: 04:00:00:D8:F5:4D dhcp-1.isp.infra.auro.re: