From 44d19e291610373de73b7140fb853b494be6cf18 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 1 Jan 2022 18:03:33 +0100 Subject: convert all remaining openwrt hosts to new image generation --- inventory/host_vars/glt-gw-tug.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'inventory/host_vars/glt-gw-tug.yml') diff --git a/inventory/host_vars/glt-gw-tug.yml b/inventory/host_vars/glt-gw-tug.yml index 5b22ecae..d80c4167 100644 --- a/inventory/host_vars/glt-gw-tug.yml +++ b/inventory/host_vars/glt-gw-tug.yml @@ -1,13 +1,9 @@ --- -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 @@ -50,7 +46,7 @@ openwrt_mixin: STOP=91 start() { - WAN_IF=$(uci get network.wan.ifname) + WAN_IF=$(uci get network.wan.device) LAN_IF="br-lan" LAN_IP=$(uci get network.lan.ipaddr) LAN_MASK=$(uci get network.lan.netmask) @@ -161,7 +157,7 @@ openwrt_uci: - name: interface 'loopback' options: - ifname: lo + device: lo proto: static ipaddr: 127.0.0.1 netmask: 255.0.0.0 @@ -169,13 +165,13 @@ openwrt_uci: - name: interface 'lan' options: type: bridge - ifname: "eth0 eth1 eth2 eth3 eth4" + device: "eth0 eth1 eth2 eth3 eth4" proto: static ipaddr: "{{ network_zones.tug_lan.prefix | ipaddr(network_zones.tug_lan.offsets[inventory_hostname]) | ipaddr('address') }}" netmask: "{{ network_zones.tug_lan.prefix | ipaddr('netmask') }}" - name: interface 'wan' options: - ifname: eth5 + device: eth5 proto: dhcp macaddr: 00:11:22:33:44:55 -- cgit v1.2.3