Restart containerd/docker to ensure that drop-in configuration is pic…

…ked up

Signed-off-by: Waleed Malik <[email protected]>

deploy/osps/default/osp-flatcar.yaml

@@ -21,7 +21,7 @@ spec:
   osName: flatcar
   ## Flatcar Stable (09/11/2021)
   osVersion: "2983.2.0"
-  version: "v1.0.2"
+  version: "v1.0.3"
   supportedCloudProviders:
     - name: "aws"
     - name: "azure"
@@ -537,14 +537,18 @@ spec:
               systemctl mask locksmithd.service
               {{- end }}
 
+              systemctl daemon-reload
+
               {{- /* Since both container runtimes are enabled/started by default in flatcar, disable the one that is not required */}}
               {{- if eq .ContainerRuntime "containerd" }}
               systemctl stop docker
               systemctl disable docker
+              systemctl restart containerd
               {{- end }}
               {{- if eq .ContainerRuntime "docker" }}
               systemctl stop containerd
               systemctl disable containerd
+              systemctl restart docker
               {{- end }}
 
               # Override hostname if /etc/machine-name exists

pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml

@@ -278,8 +278,11 @@ spec:
               }
             });
             EOF
+
+            systemctl daemon-reload
             systemctl stop docker
             systemctl disable docker
+            systemctl restart containerd
 
             # Override hostname if /etc/machine-name exists
             if [ -x "$(command -v hostnamectl)" ] && [ -s /etc/machine-name ]; then

pkg/controllers/osc/testdata/osc-flatcar-aws-docker.yaml

@@ -278,8 +278,11 @@ spec:
               }
             });
             EOF
+
+            systemctl daemon-reload
             systemctl stop containerd
             systemctl disable containerd
+            systemctl restart docker
 
             # Override hostname if /etc/machine-name exists
             if [ -x "$(command -v hostnamectl)" ] && [ -s /etc/machine-name ]; then