From a2637ac45f71ed3dd52dc55bf1efa3cf09d266c8 Mon Sep 17 00:00:00 2001 From: Simon Polack Date: Tue, 3 Dec 2024 12:59:46 +0100 Subject: [PATCH] core/gateway: drop olsrd6 config --- .../templates/corerouter/config/olsrd6.j2 | 53 ------------------- .../templates/gateway/config/olsrd6.j2 | 49 ----------------- 2 files changed, 102 deletions(-) delete mode 100644 roles/cfg_openwrt/templates/corerouter/config/olsrd6.j2 delete mode 100644 roles/cfg_openwrt/templates/gateway/config/olsrd6.j2 diff --git a/roles/cfg_openwrt/templates/corerouter/config/olsrd6.j2 b/roles/cfg_openwrt/templates/corerouter/config/olsrd6.j2 deleted file mode 100644 index c05004569..000000000 --- a/roles/cfg_openwrt/templates/corerouter/config/olsrd6.j2 +++ /dev/null @@ -1,53 +0,0 @@ -#jinja2: trim_blocks: "true", lstrip_blocks: "true" -config LoadPlugin - option library 'olsrd_nameservice' - option suffix '.olsr' - option hosts_file '/tmp/hosts/olsr6' - option latlon_file '/tmp/_unused_olsr6_latlon.js' - option services_file '/tmp/_unused_olsr6_services' - -config LoadPlugin - option accept '::' - option ipv6only 'true' - option library 'olsrd_jsoninfo' - option ignore '0' - -config olsrd - option IpVersion '6' - option FIBMetric 'flat' - option AllowNoInt 'yes' - option TcRedundancy '2' - option NatThreshold '0.75' - option LinkQualityAlgorithm 'etx_ff' - option SmartGateway 'no' - option Pollrate '0.025' - option LinkQualityLevel '2' - option OlsrPort '698' - option Willingness '3' - option TosValue '16' - option RtTable '666' - option RtTableDefault '666' - -config InterfaceDefaults - option MidValidityTime '500.0' - option TcInterval '2.0' - option HnaValidityTime '125.0' - option HelloValidityTime '125.0' - option TcValidityTime '500.0' - option MidInterval '50.0' - option HelloInterval '15.0' - option HnaInterval '30.0' - -{% for network in networks | selectattr('role', 'equalto', 'mesh') %} -config Interface - option ignore '0' - option interface '{{ network['name'] if 'name' in network else network['role'] }}' - option Mode '{{ 'ether' if network.get('ptp') else 'mesh' }}' -{% endfor %} - -{% for tunnel in networks | selectattr('role', 'equalto', 'tunnel') %} -config Interface - option interface '{{ tunnel['ifname'] }}' - option Mode 'ether' - option ignore 0 -{% endfor %} diff --git a/roles/cfg_openwrt/templates/gateway/config/olsrd6.j2 b/roles/cfg_openwrt/templates/gateway/config/olsrd6.j2 deleted file mode 100644 index 83e1e29e1..000000000 --- a/roles/cfg_openwrt/templates/gateway/config/olsrd6.j2 +++ /dev/null @@ -1,49 +0,0 @@ -#jinja2: trim_blocks: "true", lstrip_blocks: "true" -config LoadPlugin - option library 'olsrd_nameservice' - option suffix '.olsr' - option hosts_file '/tmp/hosts/olsr6' - option latlon_file '/tmp/_unused_olsr6_latlon.js' - option services_file '/tmp/_unused_olsr6_services' - -config LoadPlugin - option accept '::' - option ipv6only 'true' - option library 'olsrd_jsoninfo' - option ignore '0' - -config olsrd - option IpVersion '6' - option FIBMetric 'flat' - option AllowNoInt 'yes' - option TcRedundancy '2' - option NatThreshold '0.75' - option LinkQualityAlgorithm 'etx_ff' - option SmartGateway 'no' - option Pollrate '0.025' - option LinkQualityLevel '2' - option OlsrPort '698' - option Willingness '3' - option TosValue '16' - option RtTable '666' - option RtTableDefault '666' - -config InterfaceDefaults - option MidValidityTime '500.0' - option TcInterval '2.0' - option HnaValidityTime '125.0' - option HelloValidityTime '125.0' - option TcValidityTime '500.0' - option MidInterval '50.0' - option HelloInterval '15.0' - option HnaInterval '30.0' - -{% if mesh_links is defined and mesh_links|length>0 %} - {% for interface in mesh_links %} -config Interface - option ignore '0' - option interface '{{ interface['name'] }}' - option Mode '{{ 'ether' if interface.get('ptp') else 'mesh' }}' - {% endfor %} -{% endif %} -