From a1fbd3723c808d005f8b95d05103490df4ff2d17 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Mon, 2 Nov 2015 14:20:10 +0300 Subject: [PATCH] Use dockerctl start for supervisorctl container launch If docker daemon is restarted, the mount points are not safely torn down. dockerctl cleans these up before trying to start the container and therefore should be used. There was an original change to use direct docker commands because you could not start a container from a different Fuel release, but now this is possible and works. Therefore, this patch depends on the patch that fixes it. Depends-On: Ia864b0a9843f927aa85945e5ab0b2da4bec3a440 Change-Id: Ie3e471d1c394fac9228b7e2bf4b6877775680b3b Closes-Bug: #1511294 --- deployment/puppet/docker/templates/supervisor/base.conf.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/puppet/docker/templates/supervisor/base.conf.erb b/deployment/puppet/docker/templates/supervisor/base.conf.erb index b5838c852f..88be9bfba8 100644 --- a/deployment/puppet/docker/templates/supervisor/base.conf.erb +++ b/deployment/puppet/docker/templates/supervisor/base.conf.erb @@ -1,5 +1,5 @@ [program:docker-<%= @title %>] -command=docker start -a fuel-core-<%= @release %>-<%= @title %> +command=dockerctl -V <%= @release %> start <%= @title %> --attach numprocs=1 numprocs_start=0 priority=30