From f7dc8a32a738f785568e9b4256a6c86568c295fe Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 10 Oct 2021 00:49:47 +0200
Subject: upgrade ch-router to openwrt 21.02

---
 inventory/host_vars/ch-router.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'inventory/host_vars/ch-router.yml')

diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index db9c4525..8087356c 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -2,13 +2,13 @@
 install_playbook: openwrt
 
 openwrt_variant: openwrt
-openwrt_release: 19.07.8
+openwrt_release: 21.02.0
 openwrt_arch: x86
 openwrt_target: 64
-openwrt_profile: Generic
+openwrt_profile: generic
 openwrt_output_image_suffixes:
-  - "rootfs-ext4.img.gz"
-  - "vmlinuz"
+  - "{{ openwrt_profile }}-ext4-rootfs.img.gz"
+  - "{{ openwrt_profile }}-kernel.bin"
 
 openwrt_packages_remove:
   - ppp
@@ -125,15 +125,15 @@ openwrt_mixin:
       STOP=91
 
       start() {
-        MAGENTA_IF=$(uci get network.magenta.ifname)
+        MAGENTA_IF=$(uci get network.magenta.device)
         MAGENTA_IPADDR=$(uci get network.magenta.ipaddr)
         MAGENTA_NETMASK=$(uci get network.magenta.netmask)
 
-        MGMT_IF=$(uci get network.mgmt.ifname)
+        MGMT_IF=$(uci get network.mgmt.device)
         MGMT_IPADDR=$(uci get network.mgmt.ipaddr)
         MGMT_NETMASK=$(uci get network.mgmt.netmask)
 
-        SVC_IF=$(uci get "network.svc.ifname")
+        SVC_IF=$(uci get "network.svc.device")
         SVC_IPADDR=$(uci get "network.svc.ipaddr")
         SVC_NETMASK=$(uci get "network.svc.netmask")
 
@@ -283,21 +283,21 @@ openwrt_uci:
 
     - name: interface 'loopback'
       options:
-        ifname: lo
+        device: lo
         proto: static
         ipaddr: 127.0.0.1
         netmask: 255.0.0.0
 
     - name: interface 'svc'
       options:
-        ifname: eth0
+        device: eth0
         proto: static
         ipaddr: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.svc.prefix | ipaddr('netmask') }}"
 
     - name: interface 'magenta'
       options:
-        ifname: eth1
+        device: eth1
         proto: static
         ipaddr: "{{ network_zones.magenta.prefix | ipaddr(network_zones.magenta.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.magenta.prefix | ipaddr('netmask') }}"
@@ -306,7 +306,7 @@ openwrt_uci:
 
     - name: interface 'mgmt'
       options:
-        ifname: eth2
+        device: eth2
         proto: static
         ipaddr: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}"
-- 
cgit v1.2.3