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-router.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

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

diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml
index 3a50d302..33c8fa9b 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/inventory/host_vars/ele-router.yml
@@ -30,7 +30,7 @@ wireguard_gateway_tunnels:
 openwrt_network_external:
   - name: interface 'wanmur'
     options:
-      ifname: 'eth5'
+      device: 'eth5'
       proto: static
       ipaddr: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets[inventory_hostname]) | ipaddr('address') }}"
       netmask: "{{ network_zones.murat_transfer.prefix | ipaddr('netmask') }}"
@@ -58,7 +58,7 @@ openwrt_network_external:
 
   - name: interface 'wanlte'
     options:
-      ifname: 'eth4'
+      device: 'eth4'
       proto: static
       ipaddr: "{{ network_zones.datacop_lte.prefix | ipaddr(network_zones.datacop_lte.offsets[inventory_hostname]) | ipaddr('address') }}"
       netmask: "{{ network_zones.datacop_lte.prefix | ipaddr('netmask') }}"
@@ -104,7 +104,7 @@ openwrt_network_internal_yaml: |
   {% for zone_name in network_internal_zone_names %}
   - name: "interface '{{ zone_name }}'"
     options:
-      ifname: "eth0.{{ network_zones[zone_name].vlan }}"
+      device: "eth0.{{ network_zones[zone_name].vlan }}"
       proto: static
       ipaddr: "{{ network_zones[zone_name].gateway }}"
       netmask: "{{ network_zones[zone_name].prefix | ipaddr('netmask') }}"
@@ -119,14 +119,14 @@ openwrt_network_base:
 
   - 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: "eth0.{{ network_mgmt_zone.vlan }}"
+      device: "eth0.{{ network_mgmt_zone.vlan }}"
       proto: static
       ipaddr: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
       netmask: "{{ network_mgmt_zone.prefix | ipaddr('netmask') }}"
@@ -197,15 +197,11 @@ openwrt_dhcp_base:
       ignore: '1'
 
 
-install_playbook: openwrt
-
-openwrt_variant: openwrt
-openwrt_release: 19.07.7
 openwrt_arch: x86
 openwrt_target: 64
-openwrt_profile: Generic
+openwrt_profile: generic
 openwrt_output_image_suffixes:
-  - "combined-ext4.img.gz"
+  - "{{ openwrt_profile }}-ext4-combined.img.gz"
 
 openwrt_packages_remove:
   - ppp
@@ -294,7 +290,7 @@ openwrt_mixin:
 
       start() {
         ### management
-        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)
         iptables -A INPUT -i lo -d 127.0.0.0/8 -j ACCEPT
-- 
cgit v1.2.3