From 632de7c8c59c7866e6936d5d65813fd82b80ce70 Mon Sep 17 00:00:00 2001 From: Yu Qi Zhang Date: Fri, 21 Jun 2024 14:48:19 -0400 Subject: [PATCH] MCD-pull: run after network-online.target again This was originally reordered such that ovs-configuration was able to run when the reboot was skipped. See: https://github.com/openshift/machine-config-operator/pull/3858 This broke ARO since they require the network to be ready for the pull to happen (and generally, probably best for the network to be ready before attempting to pull the new OS image). Since the services have changed since then, ovs-configuration no longer depends on the existence of the firstboot file, so we should be able to untangle this dependency. --- .../_base/units/machine-config-daemon-pull.service.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/common/_base/units/machine-config-daemon-pull.service.yaml b/templates/common/_base/units/machine-config-daemon-pull.service.yaml index 3af85da534..a54a31e057 100644 --- a/templates/common/_base/units/machine-config-daemon-pull.service.yaml +++ b/templates/common/_base/units/machine-config-daemon-pull.service.yaml @@ -9,8 +9,8 @@ contents: | # machine-config-daemon-firstboot.service ConditionPathExists=/etc/ignition-machine-config-encapsulated.json # Run after crio-wipe so the pulled MCD image is protected against a corrupted storage from a forced shutdown - Wants=crio-wipe.service NetworkManager-wait-online.service - After=crio-wipe.service NetworkManager-wait-online.service network.service + Wants=crio-wipe.service network-online.target + After=crio-wipe.service network-online.target [Service] Type=oneshot