From 454f1d75cb291d73380389540f7174582e43fd4e Mon Sep 17 00:00:00 2001 From: Jeltz Date: Wed, 5 Apr 2023 00:18:25 +0200 Subject: [PATCH] =?UTF-8?q?rename=20rtr=20=E2=86=92=20back?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts | 24 +++++++++++------------ playbooks/bird.yml | 40 +++++++++++++++++++------------------- playbooks/ifupdown2.yml | 12 ++++++------ playbooks/ip_forward.yml | 8 ++++---- playbooks/keepalived.yml | 12 ++++++------ playbooks/knotd.yml | 12 ++++++------ playbooks/nftables.yml | 8 ++++---- playbooks/prometheus.yml | 28 +++++++++++++------------- playbooks/systemd_link.yml | 24 +++++++++++------------ 9 files changed, 84 insertions(+), 84 deletions(-) diff --git a/hosts b/hosts index a17ec3f..7140928 100644 --- a/hosts +++ b/hosts @@ -9,16 +9,16 @@ network-1.pve.infra.auro.re network-2.pve.infra.auro.re [vm_network] -edge-1.rtr.infra.auro.re -edge-2.rtr.infra.auro.re +edge-1.back.infra.auro.re +edge-2.back.infra.auro.re dns-1.int.infra.auro.re dns-2.int.infra.auro.re ssh-1.mgmt.infra.auro.re ssh-2.mgmt.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 +infra-1.back.infra.auro.re +infra-2.back.infra.auro.re +isp-1.back.infra.auro.re +isp-2.back.infra.auro.re dhcp-1.isp.infra.auro.re dhcp-2.isp.infra.auro.re radius-1.isp.infra.auro.re @@ -127,12 +127,12 @@ dhcp-1.isp.auro.re dhcp-2.isp.auro.re radius-fleming.adm.auro.re dns-1.int.infra.auro.re -isp-1.rtr.infra.auro.re -isp-2.rtr.infra.auro.re -edge-1.rtr.infra.auro.re -edge-2.rtr.infra.auro.re -infra-1.rtr.infra.auro.re -infra-2.rtr.infra.auro.re +isp-1.back.infra.auro.re +isp-2.back.infra.auro.re +edge-1.back.infra.auro.re +edge-2.back.infra.auro.re +infra-1.back.infra.auro.re +infra-2.back.infra.auro.re dhcp-1.isp.auro.re dhcp-2.isp.auro.re radius-fleming-backup.adm.auro.re diff --git a/playbooks/bird.yml b/playbooks/bird.yml index 6db5a02..9f49aba 100755 --- a/playbooks/bird.yml +++ b/playbooks/bird.yml @@ -1,12 +1,12 @@ #!/usr/bin/env ansible-playbook --- - hosts: - - isp-1.rtr.infra.auro.re - - isp-2.rtr.infra.auro.re + - isp-1.back.infra.auro.re + - isp-2.back.infra.auro.re vars: bird__router_ids: - isp-1.rtr.infra.auro.re: 10.203.1.5 - isp-2.rtr.infra.auro.re: 10.203.1.6 + isp-1.back.infra.auro.re: 10.203.1.5 + isp-2.back.infra.auro.re: 10.203.1.6 bird__router_id: "{{ bird__router_ids[inventory_hostname] }}" bird__radv_interfaces: client0: @@ -39,10 +39,10 @@ bird__asn: aurore: 43619 bird__bgp_addresses: - isp-1.rtr.infra.auro.re: + isp-1.back.infra.auro.re: - 2a09:6840:203:1:5::1 - 10.203.1.5 - isp-2.rtr.infra.auro.re: + isp-2.back.infra.auro.re: - 2a09:6840:203:1:6::1 - 10.203.1.6 bird__bgp_sessions: @@ -84,12 +84,12 @@ - bird - hosts: - - infra-1.rtr.infra.auro.re - - infra-2.rtr.infra.auro.re + - infra-1.back.infra.auro.re + - infra-2.back.infra.auro.re vars: bird__router_ids: - infra-1.rtr.infra.auro.re: 10.203.1.3 - infra-2.rtr.infra.auro.re: 10.203.1.4 + infra-1.back.infra.auro.re: 10.203.1.3 + infra-2.back.infra.auro.re: 10.203.1.4 bird__router_id: "{{ bird__router_ids[inventory_hostname] }}" bird__ospf_broadcast_interfaces: back0: null @@ -105,10 +105,10 @@ bird__asn: aurore: 43619 bird__bgp_addresses: - infra-1.rtr.infra.auro.re: + infra-1.back.infra.auro.re: - 2a09:6840:203:1:3::1 - 10.203.1.3 - infra-2.rtr.infra.auro.re: + infra-2.back.infra.auro.re: - 2a09:6840:203:1:4::1 - 10.203.1.4 bird__bgp_sessions: @@ -142,12 +142,12 @@ - bird - hosts: - - edge-1.rtr.infra.auro.re - - edge-2.rtr.infra.auro.re + - edge-1.back.infra.auro.re + - edge-2.back.infra.auro.re vars: bird__router_ids: - edge-1.rtr.infra.auro.re: 10.203.1.1 - edge-2.rtr.infra.auro.re: 10.203.1.2 + edge-1.back.infra.auro.re: 10.203.1.1 + edge-2.back.infra.auro.re: 10.203.1.2 bird__asn: aurore: 43619 crans: 204515 @@ -197,17 +197,17 @@ bird__router_id: "{{ bird__router_ids[inventory_hostname] }}" bird__bgp_addresses: edge: - edge-1.rtr.infra.auro.re: + edge-1.back.infra.auro.re: - 2a09:6840:203:1:1::1 - 10.203.1.1 - edge-2.rtr.infra.auro.re: + edge-2.back.infra.auro.re: - 2a09:6840:203:1:2::1 - 10.203.1.2 legacy: - edge-1.rtr.infra.auro.re: + edge-1.back.infra.auro.re: - 2a09:6840:129::10:2 - 10.129.10.2 - edge-2.rtr.infra.auro.re: + edge-2.back.infra.auro.re: - 2a09:6840:129::10:102 - 10.129.10.102 bird__bgp_sessions: diff --git a/playbooks/ifupdown2.yml b/playbooks/ifupdown2.yml index 3ecb747..9df0a72 100755 --- a/playbooks/ifupdown2.yml +++ b/playbooks/ifupdown2.yml @@ -12,7 +12,7 @@ - 10.206.0.1 # TODO: netbox ifupdown2__hosts: - edge-1.rtr.infra.auro.re: + edge-1.back.infra.auro.re: adm0: addresses: - 2a09:6840:128::10:2/56 @@ -33,7 +33,7 @@ addresses: - 2a09:6840:129::10:2/56 - 10.129.10.2/16 - edge-2.rtr.infra.auro.re: + edge-2.back.infra.auro.re: adm0: addresses: - 2a09:6840:128::10:102/56 @@ -101,7 +101,7 @@ addresses: - 2a09:6840:211:1:2::1/56 - 10.211.1.2/16 - infra-1.rtr.infra.auro.re: + infra-1.back.infra.auro.re: adm0: addresses: - 2a09:6840:128::10:4/56 @@ -127,7 +127,7 @@ ipv6_addrgen: false mgmt0: ipv6_addrgen: false - infra-2.rtr.infra.auro.re: + infra-2.back.infra.auro.re: adm0: addresses: - 2a09:6840:128::10:104/56 @@ -153,7 +153,7 @@ ipv6_addrgen: false mgmt0: ipv6_addrgen: false - isp-1.rtr.infra.auro.re: + isp-1.back.infra.auro.re: adm0: addresses: - 2a09:6840:128::10:5/56 @@ -193,7 +193,7 @@ vlan_id: 1004 vlan_raw_device: clients0 ipv6_addrgen: false - isp-2.rtr.infra.auro.re: + isp-2.back.infra.auro.re: adm0: addresses: - 2a09:6840:128::10:105/56 diff --git a/playbooks/ip_forward.yml b/playbooks/ip_forward.yml index d95dfff..0acf5b4 100755 --- a/playbooks/ip_forward.yml +++ b/playbooks/ip_forward.yml @@ -1,10 +1,10 @@ #!/usr/bin/env ansible-playbook --- - 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 + - edge-1.back.infra.auro.re + - edge-2.back.infra.auro.re + - infra-1.back.infra.auro.re + - infra-2.back.infra.auro.re roles: - ip_forward ... diff --git a/playbooks/keepalived.yml b/playbooks/keepalived.yml index ad313f1..abb4ae0 100755 --- a/playbooks/keepalived.yml +++ b/playbooks/keepalived.yml @@ -1,8 +1,8 @@ #!/usr/bin/env ansible-playbook --- - hosts: - - isp-1.rtr.infra.auro.re - - isp-2.rtr.infra.auro.re + - isp-1.back.infra.auro.re + - isp-2.back.infra.auro.re vars: keepalived__virtual_router_id: 80 keepalived__interface: back0 @@ -32,8 +32,8 @@ - keepalived - hosts: - - edge-1.rtr.infra.auro.re - - edge-2.rtr.infra.auro.re + - edge-1.back.infra.auro.re + - edge-2.back.infra.auro.re vars: keepalived__virtual_router_id: 81 keepalived__interface: back0 @@ -51,8 +51,8 @@ - keepalived - hosts: - - infra-1.rtr.infra.auro.re - - infra-2.rtr.infra.auro.re + - infra-1.back.infra.auro.re + - infra-2.back.infra.auro.re vars: keepalived__virtual_router_id: 82 keepalived__interface: back0 diff --git a/playbooks/knotd.yml b/playbooks/knotd.yml index 2922aad..7405242 100755 --- a/playbooks/knotd.yml +++ b/playbooks/knotd.yml @@ -349,10 +349,10 @@ network-2.pve: - 10.128.2.1 - 2a09:6840:128::2:1 - edge-1.rtr: + edge-1.back: - 10.128.10.2 - 2a09:6840:128::10:2 - edge-2.rtr: + edge-2.back: - 10.128.10.102 - 2a09:6840:128::10:102 dns-1.int: @@ -367,16 +367,16 @@ ssh-2.mgmt: - 10.128.10.101 - 2a09:6840:128::10:101 - infra-1.rtr: + infra-1.back: - 10.128.10.4 - 2a09:6840:128::10:4 - infra-2.rtr: + infra-2.back: - 10.128.10.104 - 2a09:6840:128::10:104 - isp-1.rtr: + isp-1.back: - 10.128.10.5 - 2a09:6840:128::10:5 - isp-2.rtr: + isp-2.back: - 10.128.10.105 - 2a09:6840:128::10:105 dhcp-1.isp: diff --git a/playbooks/nftables.yml b/playbooks/nftables.yml index 9f9de28..83400fc 100755 --- a/playbooks/nftables.yml +++ b/playbooks/nftables.yml @@ -1,8 +1,8 @@ #!/usr/bin/env ansible-playbook --- - hosts: - - isp-1.rtr.infra.auro.re - - isp-2.rtr.infra.auro.re + - isp-1.back.infra.auro.re + - isp-2.back.infra.auro.re vars: nftables__vars: adm_ipv6: 2a09:6840:128::/56 @@ -121,8 +121,8 @@ - nftables - hosts: - - infra-1.rtr.infra.auro.re - - infra-2.rtr.infra.auro.re + - infra-1.back.infra.auro.re + - infra-2.back.infra.auro.re vars: nftables__vars: adm_ipv6: 2a09:6840:128::/56 diff --git a/playbooks/prometheus.yml b/playbooks/prometheus.yml index e6910aa..aae43b8 100755 --- a/playbooks/prometheus.yml +++ b/playbooks/prometheus.yml @@ -9,24 +9,24 @@ - prometheus_node - hosts: - - edge-1.rtr.infra.auro.re - - edge-2.rtr.infra.auro.re - - isp-1.rtr.infra.auro.re - - isp-2.rtr.infra.auro.re - - infra-1.rtr.infra.auro.re - - infra-2.rtr.infra.auro.re + - edge-1.back.infra.auro.re + - edge-2.back.infra.auro.re + - isp-1.back.infra.auro.re + - isp-2.back.infra.auro.re + - infra-1.back.infra.auro.re + - infra-2.back.infra.auro.re vars: prometheus_keepalived__dest: /var/run/prometheus-node-exporter/keepalived.prom roles: - prometheus_keepalived - hosts: - - edge-1.rtr.infra.auro.re - - edge-2.rtr.infra.auro.re - - isp-1.rtr.infra.auro.re - - isp-2.rtr.infra.auro.re - - infra-1.rtr.infra.auro.re - - infra-2.rtr.infra.auro.re + - edge-1.back.infra.auro.re + - edge-2.back.infra.auro.re + - isp-1.back.infra.auro.re + - isp-2.back.infra.auro.re + - infra-1.back.infra.auro.re + - infra-2.back.infra.auro.re roles: - prometheus_bird @@ -52,8 +52,8 @@ port: 9090 bird: targets: - - edge-1.rtr.infra.auro.re - - edge-2.rtr.infra.auro.re + - edge-1.back.infra.auro.re + - edge-2.back.infra.auro.re address: port: 9324 prometheus__alert_rules: diff --git a/playbooks/systemd_link.yml b/playbooks/systemd_link.yml index 4d3357e..a073f0c 100755 --- a/playbooks/systemd_link.yml +++ b/playbooks/systemd_link.yml @@ -1,16 +1,16 @@ #!/usr/bin/env ansible-playbook --- - hosts: - - edge-1.rtr.infra.auro.re - - edge-2.rtr.infra.auro.re + - edge-1.back.infra.auro.re + - edge-2.back.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 + - infra-1.back.infra.auro.re + - infra-2.back.infra.auro.re + - isp-1.back.infra.auro.re + - isp-2.back.infra.auro.re - dhcp-1.isp.infra.auro.re - dhcp-2.isp.infra.auro.re - radius-1.isp.infra.auro.re @@ -23,7 +23,7 @@ - prometheus-2.monit.infra.auro.re vars: systemd_link__hosts: - edge-1.rtr.infra.auro.re: + edge-1.back.infra.auro.re: adm0: mac: 02:00:00:9E:3E:21 crans0: @@ -38,7 +38,7 @@ mac: 02:00:00:ED:70:64 router0: mac: 02:00:00:5A:17:7C - edge-2.rtr.infra.auro.re: + edge-2.back.infra.auro.re: adm0: mac: 04:00:00:F5:69:B9 crans0: @@ -77,7 +77,7 @@ mac: 04:00:00:2a:6e:be int0: mac: 04:00:00:3c:c0:5a - infra-1.rtr.infra.auro.re: + infra-1.back.infra.auro.re: adm0: mac: 02:00:00:f0:8a:dd back0: @@ -98,7 +98,7 @@ mac: 02:00:00:6b:53:14 mgmt0: mac: 02:00:00:32:86:60 - infra-2.rtr.infra.auro.re: + infra-2.back.infra.auro.re: adm0: mac: 04:00:00:d3:03:53 back0: @@ -119,14 +119,14 @@ mac: 04:00:00:f4:4c:5d mgmt0: mac: 04:00:00:1d:0e:83 - isp-1.rtr.infra.auro.re: + isp-1.back.infra.auro.re: adm0: mac: 02:00:00:D8:37:45 back0: mac: 02:00:00:BF:10:4C trunk0: mac: 02:00:00:E9:BA:15 - isp-2.rtr.infra.auro.re: + isp-2.back.infra.auro.re: adm0: mac: 04:00:00:85:C3:5D back0: