Merge pull request #17603 from ameukam/dbus-containerd

Ensure containerd starts after dbus

Author: k8s-ci-robot

nodeup/pkg/model/containerd.go

@@ -183,7 +183,7 @@ func (b *ContainerdBuilder) buildSystemdService(containerdVersion semver.Version
 	manifest := &systemd.Manifest{}
 	manifest.Set("Unit", "Description", "containerd container runtime")
 	manifest.Set("Unit", "Documentation", "https://containerd.io")
-	manifest.Set("Unit", "After", "network.target local-fs.target")
+	manifest.Set("Unit", "After", "network.target dbus.service")
 
 	manifest.Set("Service", "EnvironmentFile", "/etc/sysconfig/containerd")
 	manifest.Set("Service", "EnvironmentFile", "/etc/environment")

nodeup/pkg/model/tests/containerdbuilder/complex/tasks.yaml

@@ -349,7 +349,7 @@ definition: |
   [Unit]
   Description=containerd container runtime
   Documentation=https://containerd.io
-  After=network.target local-fs.target
+  After=network.target dbus.service
 
   [Service]
   EnvironmentFile=/etc/sysconfig/containerd

nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml

@@ -342,7 +342,7 @@ definition: |
   [Unit]
   Description=containerd container runtime
   Documentation=https://containerd.io
-  After=network.target local-fs.target
+  After=network.target dbus.service
 
   [Service]
   EnvironmentFile=/etc/sysconfig/containerd