6 files changed, 4 insertions, 46 deletions
diff --git a/roles/network/meta/argument_specs.yml b/roles/network/meta/argument_specs.yml
index 0c9f74fe..5f74b45c 100644
--- a/roles/network/meta/argument_specs.yml
+++ b/roles/network/meta/argument_specs.yml
@@ -21,15 +21,6 @@ argument_specs:
       network_ipv4_dns:
         type: "str"
         description: "The network IP(4) gateway to configure when provided"
-      network_ipv6_address:
-        type: "str"
-        description: "The network IP(6) address to configure when provided"
-      network_ipv6_gateway:
-        type: "str"
-        description: "The network IP(6) gateway to configure when provided"
-      network_ipv6_dns:
-        type: "str"
-        description: "The network IP(4) gateway to configure when provided"
       network_bridge_interface:
         type: "str"
         description: "Physical NIC to enslave as vmbr0 bridge port"
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 967a0b30..3bd85040 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -13,14 +13,6 @@
     fail_msg: "network_ipv4_address and network_ipv4_gateway are required together"
   when: network_ipv4_address is defined or network_ipv4_gateway is defined
 
-- name: "Validate network_ipv6_* params"
-  ansible.builtin.assert:
-    that:
-      - network_ipv6_address is defined
-      - network_ipv6_gateway is defined
-    fail_msg: "network_ipv6_address and network_ipv6_gateway are required together"
-  when: network_ipv6_address is defined or network_ipv6_gateway is defined
-
 - name: "Ensure network enabled services are enabled"
   become: true
   ansible.builtin.systemd_service:
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]