From 44d19e291610373de73b7140fb853b494be6cf18 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 1 Jan 2022 18:03:33 +0100
Subject: convert all remaining openwrt hosts to new image generation

---
 inventory/host_vars/ele-tub.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'inventory/host_vars/ele-tub.yml')

diff --git a/inventory/host_vars/ele-tub.yml b/inventory/host_vars/ele-tub.yml
index ee2bed4d..aef83dc5 100644
--- a/inventory/host_vars/ele-tub.yml
+++ b/inventory/host_vars/ele-tub.yml
@@ -4,15 +4,11 @@ ssh_users_root:
   - datacop
 
 
-install_playbook: openwrt
-
-openwrt_variant: openwrt
-openwrt_release: 19.07.7
 openwrt_arch: x86
 openwrt_target: geode
-openwrt_profile: Generic
+openwrt_profile: generic
 openwrt_output_image_suffixes:
-  - "combined-ext4.img.gz"
+  - "{{ openwrt_profile }}-ext4-combined.img.gz"
 
 openwrt_packages_remove:
   - ppp
@@ -69,8 +65,8 @@ openwrt_mixin:
       STOP=91
 
       start() {
-        FF_IF=$(uci get network.ff.ifname)
-        FFSUBNET_IF=$(uci get network.ffsubnet.ifname)
+        FF_IF=$(uci get network.ff.device)
+        FFSUBNET_IF=$(uci get network.ffsubnet.device)
         FFSUBNET_IPADDR=$(uci get network.ffsubnet.ipaddr)
         FFSUBNET_NETMASK=$(uci get network.ffsubnet.netmask)
 
@@ -119,28 +115,28 @@ openwrt_uci:
 
     - name: interface 'loopback'
       options:
-        ifname: lo
+        device: lo
         proto: static
         ipaddr: 127.0.0.1
         netmask: 255.0.0.0
 
     - 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') }}"
 
     - name: interface 'ffsubnet'
       options:
-        ifname: eth1
+        device: eth1
         proto: static
         ipaddr: "{{ network_zones.funkfeuer.prefix | ipaddr(network_zones.funkfeuer.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.funkfeuer.prefix | ipaddr('netmask') }}"
 
     - name: interface 'ff'
       options:
-        ifname: eth0
+        device: eth0
         proto: static
         ipaddr: 10.12.91.28
         netmask: 255.255.0.0
-- 
cgit v1.2.3