From d3f919c8671073672115969c3a5fbdec90ac85d5 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 29 May 2024 22:34:32 +0200
Subject: revert some debian/preseed and ubuntu/autoinstall changes because
 they don't really work

---
 .../debian/preseed/templates/preseed_debian-bookworm.cfg.j2       | 8 ++++----
 roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2   | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'roles')

diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2
index f96231b0..3e86b048 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2
@@ -23,15 +23,15 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
-d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway }}
+d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
 d-i netcfg/hostname string {{ host_name }}
 d-i netcfg/get_hostname string {{ host_name }}
-d-i netcfg/domain string {{ network.domain | default('') }}
-d-i netcfg/get_domain string {{ network.domain | default('') }}
+d-i netcfg/domain string {{ network.domain }}
+d-i netcfg/get_domain string {{ network.domain }}
 d-i netcfg/wireless_wep string
 
 
diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
index 612ba038..fd78bc4d 100644
--- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
+++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
@@ -19,16 +19,12 @@ autoinstall:
 {% else %}
         addresses:
         - {{ network.primary.address }}
-{%   if 'gateway' in network %}
         routes:
         - to: default
           via: {{ network.primary.gateway }}
-{%   endif %}
 {%   if (network.nameservers  | default([]) | length) > 0 %}
         nameservers:
-{%     if 'domain' in network %}
           search: [ {{ network.domain }} ]
-{%     endif %}
           addresses: [ {{ network.nameservers | join(', ') }} ]
 {%   endif %}
 {% endif %}
-- 
cgit v1.2.3