ele-router-*: add sqm

2 files changed, 55 insertions, 26 deletions

diff --git a/inventory/host_vars/ele-router-hmtsaal.yml b/inventory/host_vars/ele-router-hmtsaal.yml
index b9e21ca2..0bfef1fe 100644
--- a/inventory/host_vars/ele-router-hmtsaal.yml
+++ b/inventory/host_vars/ele-router-hmtsaal.yml
@@ -9,7 +9,7 @@ network_internal_zone_names:
 
 
 openwrt_network_external:
-  - name: interface 'wan'
+  - name: interface 'citycom'
     options:
       device: 'eth1'
       proto: static
@@ -55,9 +55,9 @@ openwrt_network_base:
 
 
 openwrt_dhcp_external:
-  - name: dhcp 'wan'
+  - name: dhcp 'citycom'
     options:
-      interface: 'wan'
+      interface: 'citycom'
       ignore: '1'
 
 
@@ -138,7 +138,7 @@ openwrt_packages_add:
   - iperf3
   - mtr
   - iptraf-ng
-  - qos-scripts
+  - sqm-scripts
   - prometheus-node-exporter-lua
   - prometheus-node-exporter-lua-nat_traffic
   - prometheus-node-exporter-lua-netstat
@@ -178,8 +178,8 @@ openwrt_mixin:
     content: |
       flush ruleset
 
-      define nic_wan = eth1
-      define ip_wan = {{ network_zones.cc_hmtsaal.prefix | ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ipaddr('address') }}
+      define nic_citycom = eth1
+      define ip_citycom = {{ network_zones.cc_hmtsaal.prefix | ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ipaddr('address') }}
 
       define nic_mgmt = "eth0.{{ network_mgmt_zone.vlan }}"
       define prefix_mgmt = {{ network_mgmt_zone.prefix }}
@@ -207,7 +207,7 @@ openwrt_mixin:
         chain input {
           type filter hook input priority filter; policy drop;
           ct state vmap { established: accept, related: accept, invalid: drop }
-          iifname vmap { lo: accept, $nic_mgmt: accept{% for zone_name in network_internal_zone_names %}, $nic_{{ zone_name }}: jump input_internal {% endfor %}, $nic_wan: jump input_external }
+          iifname vmap { lo: accept, $nic_mgmt: accept{% for zone_name in network_internal_zone_names %}, $nic_{{ zone_name }}: jump input_internal {% endfor %}, $nic_citycom: jump input_external }
         }
 
 
@@ -215,12 +215,12 @@ openwrt_mixin:
         chain forward {
           type filter hook forward priority filter; policy drop;
           ct state vmap { established: accept, related: accept, invalid: drop }
-          iifname { {{ ['$nic_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_wan accept
+          iifname { {{ ['$nic_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_citycom accept
         }
 
         chain postrouting {
           type nat hook postrouting priority srcnat; policy accept;
-          ip saddr { {{ ['$prefix_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_wan snat to $ip_wan
+          ip saddr { {{ ['$prefix_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_citycom snat to $ip_citycom
         }
       }
 
@@ -262,6 +262,23 @@ openwrt_uci:
   dhcp: "{{ openwrt_dhcp_base + openwrt_dhcp_internal + openwrt_dhcp_external }}"
   network: "{{ openwrt_network_base + openwrt_network_internal + openwrt_network_external }}"
 
+  sqm:
+    - name: queue 'citycom'
+      options:
+        enabled: '1'
+        interface: 'eth1'
+        download: '10000'
+        upload: '10000'
+        qdisc: 'cake'
+        script: 'piece_of_cake.qos'
+        qdisc_advanced: '0'
+        ingress_ecn: 'ECN'
+        egress_ecn: 'ECN'
+        qdisc_really_really_advanced: '0'
+        itarget: 'auto'
+        etarget: 'auto'
+        linklayer: 'ethernet'
+        overhead: '44 mpu 84'
 
 prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
 prometheus_exporters_default:
diff --git a/inventory/host_vars/ele-router-leslie.yml b/inventory/host_vars/ele-router-leslie.yml
index ef97e055..70bce3df 100644
--- a/inventory/host_vars/ele-router-leslie.yml
+++ b/inventory/host_vars/ele-router-leslie.yml
@@ -9,7 +9,7 @@ network_internal_zone_names:
 
 
 openwrt_network_external:
-  - name: interface 'wan'
+  - name: interface 'citycom'
     options:
       device: 'eth1'
       proto: static
@@ -55,9 +55,9 @@ openwrt_network_base:
 
 
 openwrt_dhcp_external:
-  - name: dhcp 'wan'
+  - name: dhcp 'citycom'
     options:
-      interface: 'wan'
+      interface: 'citycom'
       ignore: '1'
 
 
@@ -120,16 +120,11 @@ openwrt_output_image_suffixes:
 openwrt_packages_remove:
   - ppp
   - ppp-mod-pppoe
+  - kmod-ppp
+  - kmod-pppoe
+  - kmod-pppox
   - firewall
   - odhcpd-ipv6only
-  - linux-atm
-  - kmod-pppoa
-  - kmod-mppe
-  - ppp-mod-pppoa
-  - pppstats
-  - pppdump
-  - iwinfo
-  - soloscli
 openwrt_packages_add:
   - nftables
   - kmod-nft-nat
@@ -143,7 +138,7 @@ openwrt_packages_add:
   - iperf3
   - mtr
   - iptraf-ng
-  - qos-scripts
+  - sqm-scripts
   - prometheus-node-exporter-lua
   - prometheus-node-exporter-lua-nat_traffic
   - prometheus-node-exporter-lua-netstat
@@ -183,8 +178,8 @@ openwrt_mixin:
     content: |
       flush ruleset
 
-      define nic_wan = eth1
-      define ip_wan = {{ network_zones.cc_leslie.prefix | ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) | ipaddr('address') }}
+      define nic_citycom = eth1
+      define ip_citycom = {{ network_zones.cc_leslie.prefix | ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) | ipaddr('address') }}
 
       define nic_mgmt = "eth0.{{ network_mgmt_zone.vlan }}"
       define prefix_mgmt = {{ network_mgmt_zone.prefix }}
@@ -212,7 +207,7 @@ openwrt_mixin:
         chain input {
           type filter hook input priority filter; policy drop;
           ct state vmap { established: accept, related: accept, invalid: drop }
-          iifname vmap { lo: accept, $nic_mgmt: accept{% for zone_name in network_internal_zone_names %}, $nic_{{ zone_name }}: jump input_internal {% endfor %}, $nic_wan: jump input_external }
+          iifname vmap { lo: accept, $nic_mgmt: accept{% for zone_name in network_internal_zone_names %}, $nic_{{ zone_name }}: jump input_internal {% endfor %}, $nic_citycom: jump input_external }
         }
 
 
@@ -220,12 +215,12 @@ openwrt_mixin:
         chain forward {
           type filter hook forward priority filter; policy drop;
           ct state vmap { established: accept, related: accept, invalid: drop }
-          iifname { {{ ['$nic_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_wan accept
+          iifname { {{ ['$nic_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_citycom accept
         }
 
         chain postrouting {
           type nat hook postrouting priority srcnat; policy accept;
-          ip saddr { {{ ['$prefix_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_wan snat to $ip_wan
+          ip saddr { {{ ['$prefix_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_citycom snat to $ip_citycom
         }
       }
 
@@ -267,6 +262,23 @@ openwrt_uci:
   dhcp: "{{ openwrt_dhcp_base + openwrt_dhcp_internal + openwrt_dhcp_external }}"
   network: "{{ openwrt_network_base + openwrt_network_internal + openwrt_network_external }}"
 
+  sqm:
+    - name: queue 'citycom'
+      options:
+        enabled: '1'
+        interface: 'eth1'
+        download: '10000'
+        upload: '10000'
+        qdisc: 'cake'
+        script: 'piece_of_cake.qos'
+        qdisc_advanced: '0'
+        ingress_ecn: 'ECN'
+        egress_ecn: 'ECN'
+        qdisc_really_really_advanced: '0'
+        itarget: 'auto'
+        etarget: 'auto'
+        linklayer: 'ethernet'
+        overhead: '44 mpu 84'
 
 prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
 prometheus_exporters_default: