From e06dc8a7b62ad3029503914602401d5f235ce442 Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhalim Date: Wed, 8 Jul 2026 03:32:42 +0200 Subject: Refactor network role MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove static IPv6 support from network role — all hosts use SLAAC (method=auto). Simplifies NM templates, argument_specs, and resolved.conf. gateway sysctl accept_ra=2 is now unconditional when gateway_enabled. Co-authored-by: Claude.ai --- roles/network/templates/bridge.nmconnection.j2 | 11 +---------- roles/network/templates/eth0-connection.nmconnection.j2 | 7 ------- roles/network/templates/resolved.conf.j2 | 6 +++--- roles/network/templates/wifi-connection.nmconnection.j2 | 9 --------- 4 files changed, 4 insertions(+), 29 deletions(-) (limited to 'roles/network/templates') diff --git a/roles/network/templates/bridge.nmconnection.j2 b/roles/network/templates/bridge.nmconnection.j2 index 013acd6a..42c77380 100644 --- a/roles/network/templates/bridge.nmconnection.j2 +++ b/roles/network/templates/bridge.nmconnection.j2 @@ -17,13 +17,4 @@ dns={{ network_ipv4_dns }} [ipv6] addr-gen-mode=default -{% if network_ipv6_address is defined %} -method=manual -addresses={{ network_ipv6_address }} -gateway={{ network_ipv6_gateway }} -{% if network_ipv6_dns is defined %} -dns={{ network_ipv6_dns }} -{% endif %} -{% else %} -method=disabled -{% endif %} +method=auto diff --git a/roles/network/templates/eth0-connection.nmconnection.j2 b/roles/network/templates/eth0-connection.nmconnection.j2 index 56d562f9..b1bc87a8 100644 --- a/roles/network/templates/eth0-connection.nmconnection.j2 +++ b/roles/network/templates/eth0-connection.nmconnection.j2 @@ -30,13 +30,6 @@ method=auto addr-gen-mode=default {% if network_bridge_interface is defined %} method=disabled -{% elif network_ipv6_address is defined %} -method=manual -addresses={{ network_ipv6_address }} -gateway={{ network_ipv6_gateway }} -{% if network_ipv6_dns is defined %} -dns={{ network_ipv6_dns }} -{% endif %} {% else %} method=auto {% endif %} diff --git a/roles/network/templates/resolved.conf.j2 b/roles/network/templates/resolved.conf.j2 index ea4a818a..0354feeb 100644 --- a/roles/network/templates/resolved.conf.j2 +++ b/roles/network/templates/resolved.conf.j2 @@ -1,8 +1,8 @@ [Resolve] DNS={{ network_ipv4_dns | default('1.1.1.1 2606:4700:4700::1111') }} -FallbackDNS={{ network_ipv6_dns | default('8.8.8.8 2001:4860:4860::8888') }} -DNSOverTLS={{ 'no' if (network_ipv4_dns is defined or network_ipv6_dns is defined) else 'yes' }} -DNSSEC={{ 'no' if (network_ipv4_dns is defined or network_ipv6_dns is defined) else 'yes' }} +FallbackDNS=8.8.8.8 2001:4860:4860::8888 +DNSOverTLS={{ 'no' if network_ipv4_dns is defined else 'yes' }} +DNSSEC={{ 'no' if network_ipv4_dns is defined else 'yes' }} # use interface-specific DNS when available but fall back to global (required for VPN DNS to work) Domains=~. diff --git a/roles/network/templates/wifi-connection.nmconnection.j2 b/roles/network/templates/wifi-connection.nmconnection.j2 index 0fd69cb1..3d7667c8 100644 --- a/roles/network/templates/wifi-connection.nmconnection.j2 +++ b/roles/network/templates/wifi-connection.nmconnection.j2 @@ -27,15 +27,6 @@ method=auto [ipv6] addr-gen-mode=default -{% if network_ipv6_address is defined %} -method=manual -addresses={{ network_ipv6_address }} -gateway={{ network_ipv6_gateway }} -{% if network_ipv6_dns is defined %} -dns={{ network_ipv6_dns }} -{% endif %} -{% else %} method=auto -{% endif %} [proxy] -- cgit v1.2.3