diff --git a/playbooks/roles/devconfig/tasks/install-deps/debian/main.yml b/playbooks/roles/devconfig/tasks/install-deps/debian/main.yml index 53a3d451..c8c18bb0 100644 --- a/playbooks/roles/devconfig/tasks/install-deps/debian/main.yml +++ b/playbooks/roles/devconfig/tasks/install-deps/debian/main.yml @@ -40,15 +40,9 @@ - apt-daily.timer - apt-daily-upgrade.service - apt-daily-upgrade.timer + - systemd-networkd-wait-online.service ignore_errors: yes -- name: Set up 89-ethernet.network - become: yes - become_method: sudo - template: - src: 89-ethernet.network.j2 - dest: /etc/systemd/network/89-ethernet.network - - name: Allow for distro source change / upgrade become: yes become_flags: 'su - -c' diff --git a/playbooks/roles/devconfig/templates/89-ethernet.network.j2 b/playbooks/roles/devconfig/templates/89-ethernet.network.j2 deleted file mode 100644 index f882f13f..00000000 --- a/playbooks/roles/devconfig/templates/89-ethernet.network.j2 +++ /dev/null @@ -1,9 +0,0 @@ -# kdevops generated 89-ethernet.network -# Enable DHCPv4 and DHCPv6 on all physical ethernet links -# systemd-networkd-wait-online.service likes to fail on an empty /etc/systemd/network/ -# and we may leverage systemd-networkd-wait-online.service for other services. -[Match] -Kind=!* -Type=ether -[Network] -DHCP=yes diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh index f68f4d35..74eeceac 100755 --- a/scripts/bringup_guestfs.sh +++ b/scripts/bringup_guestfs.sh @@ -250,15 +250,6 @@ uninstall cloud-init write /etc/default/locale:LANG=en_US.UTF-8 append-line /etc/default/locale:LANGUAGE=en_US:en write /etc/locale.gen:en_US.UTF-8 UTF-8 -write /etc/systemd/network/89-ethernet.network: # kdevops generated 89-ethernet.network -append-line write /etc/systemd/network/89-ethernet.network:# Enable DHCPv4 and DHCPv6 on all physical ethernet links -append-line write /etc/systemd/network/89-ethernet.network:# systemd-networkd-wait-online.service likes to fail on an empty /etc/systemd/network/ -append-line write /etc/systemd/network/89-ethernet.network:# and we may leverage systemd-networkd-wait-online.service for other services. -append-line write /etc/systemd/network/89-ethernet.network:[Match] -append-line write /etc/systemd/network/89-ethernet.network:Kind=!* -append-line write /etc/systemd/network/89-ethernet.network:Type=ether -append-line write /etc/systemd/network/89-ethernet.network:[Network] -append-line write /etc/systemd/network/89-ethernet.network:DHCP=yes firstboot-command locale-gen en_US.UTF-8 firstboot-command update-locale LANG=en_US.UTF-8 firstboot-command DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true dpkg-reconfigure -p low --force locales