convert all remaining openwrt hosts to new image generation

6 files changed, 36 insertions, 60 deletions

diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index c371c881..3be8367b 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -1,8 +1,4 @@
 ---
-install_playbook: openwrt
-
-openwrt_variant: openwrt
-openwrt_release: 21.02.1
 openwrt_arch: x86
 openwrt_target: 64
 openwrt_profile: generic
diff --git a/inventory/host_vars/ele-orpheum.yml b/inventory/host_vars/ele-orpheum.yml
index c6d25b4d..9c4a02df 100644
--- a/inventory/host_vars/ele-orpheum.yml
+++ b/inventory/host_vars/ele-orpheum.yml
@@ -1,13 +1,9 @@
 ---
-install_playbook: openwrt
-
-openwrt_variant: openwrt
-openwrt_release: 19.07.1
 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
@@ -78,24 +74,24 @@ openwrt_uci:
 
     - name: interface 'loopback'
       options:
-        ifname: lo
+        device: lo
         proto: static
         ipaddr: 127.0.0.1
         netmask: 255.0.0.0
 
     - name: interface 'unused0'
       options:
-        ifname: eth0
+        device: eth0
         proto: none
 
     - name: interface 'unused1'
       options:
-        ifname: eth1
+        device: eth1
         proto: none
 
     - name: interface 'lan'
       options:
-        ifname: eth2
+        device: eth2
         proto: static
         ipaddr: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
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
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
diff --git a/inventory/host_vars/glt-gw-r3.yml b/inventory/host_vars/glt-gw-r3.yml
index 3fc1978f..b15edfec 100644
--- a/inventory/host_vars/glt-gw-r3.yml
+++ b/inventory/host_vars/glt-gw-r3.yml
@@ -1,13 +1,9 @@
 ---
-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
@@ -52,8 +48,8 @@ openwrt_mixin:
       STOP=91
 
       start() {
-        WAN_IF=$(uci get network.wan.ifname)
-        LAN_IF=$(uci get network.lan.ifname)
+        WAN_IF=$(uci get network.wan.device)
+        LAN_IF=$(uci get network.lan.device)
         LAN_IP=$(uci get network.lan.ipaddr)
         LAN_MASK=$(uci get network.lan.netmask)
 
@@ -124,14 +120,14 @@ openwrt_uci:
 
     - name: interface 'loopback'
       options:
-        ifname: lo
+        device: lo
         proto: static
         ipaddr: 127.0.0.1
         netmask: 255.0.0.0
 
     - name: interface 'wan'
       options:
-        ifname: eth0
+        device: eth0
         proto: static
         ipaddr: "{{ network_zones.r3_ff.prefix | ipaddr(network_zones.r3_ff.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.r3_ff.prefix | ipaddr('netmask') }}"
@@ -140,12 +136,12 @@ openwrt_uci:
 
     - name: interface 'lan'
       options:
-        ifname: eth1
+        device: eth1
         proto: static
         ipaddr: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.r3_lan.prefix | ipaddr('netmask') }}"
 
     - name: interface 'unused'
       options:
-        ifname: eth2
+        device: eth2
         proto: none
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