Skip to content

Commit

Permalink
MCD-pull: run after network-online.target again
Browse files Browse the repository at this point in the history
This was originally reordered such that ovs-configuration was able to
run when the reboot was skipped. See: openshift#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.
  • Loading branch information
yuqi-zhang committed Jun 21, 2024
1 parent 612b9cd commit 632de7c
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 632de7c

Please sign in to comment.