Skip to content

Commit b9e7570

Browse files
committed
devconfig: remove 89-ethernet.network
The work on commit 683610d ("debian: install /etc/systemd/network/89-ethernet.network") tried to do the best we can with the willy bug present on systemd-networkd-wait-online.service where if that service is enabled and you have no configuration for ethernet the service never completes and fails and this can often cause some services to time out that we may want to setup. It turns out that adding our own /etc/systemd/network/89-ethernet.network just to annotate we need dhcp is not sufficient to fix the issue across all the self-hosted runners used by kdevops. Although many CIs are not affected one system, the one used for the linux-firmware CI using the linux-firwmare-kpd kept failing at bringup. Upon closer inspection on the console, even if we upgraded the host and rebooted into the latest debian testing packages, the host still had issues. The console on the guest revealed that the IP address shifted when the file 89-ethernet.network was installed and the server restarted, so the timeout on bringup was caused because the IP address we obtained first for ssh-detection changed, so we can no longer connect to the guest. Strange enough, if you reboot the guest we see the guest afterwards gets *two* IP addresses assigned! This is just nuts. So disable systemd-networkd-wait-online.service as that is completely buggy and I don't think folks really thought this out well. Fixes: 683610d ("debian: install /etc/systemd/network/89-ethernet.network") Signed-off-by: Luis Chamberlain <[email protected]>
1 parent 01b0bdd commit b9e7570

File tree

3 files changed

+1
-25
lines changed

3 files changed

+1
-25
lines changed

playbooks/roles/devconfig/tasks/install-deps/debian/main.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,9 @@
4040
- apt-daily.timer
4141
- apt-daily-upgrade.service
4242
- apt-daily-upgrade.timer
43+
- systemd-networkd-wait-online.service
4344
ignore_errors: yes
4445

45-
- name: Set up 89-ethernet.network
46-
become: yes
47-
become_method: sudo
48-
template:
49-
src: 89-ethernet.network.j2
50-
dest: /etc/systemd/network/89-ethernet.network
51-
5246
- name: Allow for distro source change / upgrade
5347
become: yes
5448
become_flags: 'su - -c'

playbooks/roles/devconfig/templates/89-ethernet.network.j2

Lines changed: 0 additions & 9 deletions
This file was deleted.

scripts/bringup_guestfs.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -250,15 +250,6 @@ uninstall cloud-init
250250
write /etc/default/locale:LANG=en_US.UTF-8
251251
append-line /etc/default/locale:LANGUAGE=en_US:en
252252
write /etc/locale.gen:en_US.UTF-8 UTF-8
253-
write /etc/systemd/network/89-ethernet.network: # kdevops generated 89-ethernet.network
254-
append-line write /etc/systemd/network/89-ethernet.network:# Enable DHCPv4 and DHCPv6 on all physical ethernet links
255-
append-line write /etc/systemd/network/89-ethernet.network:# systemd-networkd-wait-online.service likes to fail on an empty /etc/systemd/network/
256-
append-line write /etc/systemd/network/89-ethernet.network:# and we may leverage systemd-networkd-wait-online.service for other services.
257-
append-line write /etc/systemd/network/89-ethernet.network:[Match]
258-
append-line write /etc/systemd/network/89-ethernet.network:Kind=!*
259-
append-line write /etc/systemd/network/89-ethernet.network:Type=ether
260-
append-line write /etc/systemd/network/89-ethernet.network:[Network]
261-
append-line write /etc/systemd/network/89-ethernet.network:DHCP=yes
262253
firstboot-command locale-gen en_US.UTF-8
263254
firstboot-command update-locale LANG=en_US.UTF-8
264255
firstboot-command DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true dpkg-reconfigure -p low --force locales

0 commit comments

Comments
 (0)