Docker service now depends on containerd service

Signed-off-by: Balint Varga <balint.varga@nokia.com>
Change-Id: I6403abe77365d517445fb8c81ea77609591035fe

diff --git a/SPECS/instantiate.spec b/SPECS/instantiate.spec
index bee845f..6db95c9 100644 (file)
--- a/SPECS/instantiate.spec
+++ b/SPECS/instantiate.spec
@@ -15,7 +15,7 @@
 %define COMPONENT instantiate
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 23
+%define RPM_MINOR_VERSION 24
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}

diff --git a/ansible/roles/docker/templates/docker.service b/ansible/roles/docker/templates/docker.service
index d7a0df4..8a4a529 100644 (file)
--- a/ansible/roles/docker/templates/docker.service
+++ b/ansible/roles/docker/templates/docker.service
@@ -16,7 +16,7 @@ limitations under the License.
 [Unit]
 Description=Docker Application Container Engine
 Documentation=https://docs.docker.com
-After=network.target docker.socket
+After=network.target docker.socket containerd.service
 Requires=docker.socket
 Before=kubelet.service
 Wants=kubelet.service
@@ -28,6 +28,8 @@ MemoryAccounting=true
 CPUAccounting=true
 BlockIOAccounting=true
 TasksAccounting=true
+Delegate=yes
+KillMode=process
 Type=notify
 EnvironmentFile=-/etc/sysconfig/docker-storage
 EnvironmentFile=-/etc/sysconfig/docker-proxy
@@ -46,6 +48,7 @@ ExecStart=/usr/bin/dockerd -H  fd:// \
                            --ip-forward=false \
                            --live-restore=true \
                            --bip={{ caas.docker0_cidr | default('172.17.0.1/16', true) }} \
+                           --containerd=/run/containerd/containerd.sock \
                            --exec-opt native.cgroupdriver=cgroupfs \
                            $DOCKER_STORAGE_OPTIONS
 MountFlags=shared