From cc1786eb2b61667453e244974f112d8518f768d9 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Tue, 4 Apr 2023 01:33:16 +0200 Subject: [PATCH] =?UTF-8?q?backbone=20=E2=86=92=20back=20+=20ap=20?= =?UTF-8?q?=E2=86=92=20wifi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- playbooks/bird.yml | 4 ++-- playbooks/ifupdown2.yml | 8 ++++---- playbooks/keepalived.yml | 4 ++-- playbooks/systemd_link.yml | 16 ++++------------ 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/playbooks/bird.yml b/playbooks/bird.yml index 3b72b18..6db5a02 100755 --- a/playbooks/bird.yml +++ b/playbooks/bird.yml @@ -95,7 +95,7 @@ back0: null bird__ospf_stub_interfaces: - monit0 - - ap0 + - wifi0 - int0 - pub0 - bmc0 @@ -398,7 +398,7 @@ # accept: true # - accept: false bird__ospf_broadcast_interfaces: - backbone0: null + back0: null bird__ospf_stub_interfaces: - crans0 - zayo0 diff --git a/playbooks/ifupdown2.yml b/playbooks/ifupdown2.yml index a8c58b9..3ecb747 100755 --- a/playbooks/ifupdown2.yml +++ b/playbooks/ifupdown2.yml @@ -23,7 +23,7 @@ ipv6_addrgen: false rezel0: ipv6_addrgen: false - backbone0: + back0: addresses: - 2a09:6840:203:1:1::1/56 - 10.203.1.1/16 @@ -44,7 +44,7 @@ ipv6_addrgen: false rezel0: ipv6_addrgen: false - backbone0: + back0: addresses: - 2a09:6840:203:1:2::1/56 - 10.203.1.2/16 @@ -113,7 +113,7 @@ - 10.203.1.3/16 monit0: ipv6_addrgen: false - ap0: + wifi0: ipv6_addrgen: false int0: ipv6_addrgen: false @@ -139,7 +139,7 @@ - 10.203.1.4/16 monit0: ipv6_addrgen: false - ap0: + wifi0: ipv6_addrgen: false int0: ipv6_addrgen: false diff --git a/playbooks/keepalived.yml b/playbooks/keepalived.yml index 1511679..ad313f1 100755 --- a/playbooks/keepalived.yml +++ b/playbooks/keepalived.yml @@ -36,7 +36,7 @@ - edge-2.rtr.infra.auro.re vars: keepalived__virtual_router_id: 81 - keepalived__interface: backbone0 + keepalived__interface: back0 keepalived__virtual_addresses: crans0: - 185.230.79.254/29 @@ -61,7 +61,7 @@ - 10.204.0.1/16 - 2a09:6840:204::1/56 - fe80::1/10 - ap0: + wifi0: - 10.205.0.1/16 - 2a09:6840:205::1/56 - fe80::1/10 diff --git a/playbooks/systemd_link.yml b/playbooks/systemd_link.yml index 4557e39..4d3357e 100755 --- a/playbooks/systemd_link.yml +++ b/playbooks/systemd_link.yml @@ -32,7 +32,7 @@ mac: 02:00:00:35:89:82 rezel0: mac: 02:00:00:8F:4A:AD - backbone0: + back0: mac: 02:00:00:1C:3A:2E viarezo0: mac: 02:00:00:ED:70:64 @@ -47,7 +47,7 @@ mac: 04:00:00:67:7B:12 rezel0: mac: 04:00:00:C6:05:B7 - backbone0: + back0: mac: 04:00:00:DE:22:E6 viarezo0: mac: 04:00:00:45:FA:E6 @@ -82,11 +82,9 @@ mac: 02:00:00:f0:8a:dd back0: mac: 02:00:00:f8:93:22 - backbone0: - enabled: false monit0: mac: 02:00:00:da:97:7f - ap0: + wifi0: mac: 02:00:00:8c:c5:bf int0: mac: 02:00:00:75:40:3e @@ -105,11 +103,9 @@ mac: 04:00:00:d3:03:53 back0: mac: 04:00:00:46:ba:f9 - backbone0: - enabled: false monit0: mac: 04:00:00:72:0b:2d - ap0: + wifi0: mac: 04:00:00:ee:42:0f int0: mac: 04:00:00:21:fd:d0 @@ -128,8 +124,6 @@ mac: 02:00:00:D8:37:45 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: @@ -137,8 +131,6 @@ mac: 04:00:00:85:C3:5D 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: