From 1ea54d02b8282d991c717d87391239613ec663cd Mon Sep 17 00:00:00 2001 From: Michal Skalski Date: Tue, 31 Mar 2015 09:27:25 +0200 Subject: Fix problems during build/deployment process If we used 'make all' for build iso, only release section from f_odl_docker Makefile was executed, so odl docker image and docker binary were not created. This patch also try resolve problems which appeared during execution of start_odl_container.sh on controller node: * install and run cgroup-lite to mitigate 'failed to find the cgroup root' error * use proper path to docker image and binary * prevent import of docker image before daemon is not fully initialized * because docker binary is delivered by puppet, we should execute commands against it, not try use system binary which is probably not present on controller node * stop use daemon mode('-d') of 'docker run' if user want to have access to container shell * fix name of start script which is run inside container when daemon mode is used It looks like file 'fuel/build/f_odl_docker/scripts/start_odl_container.sh' is not used and duplicate: 'fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh' JIRA: Change-Id: Ia6064dbacf30902bda557e5d0b631b5f5f207b5e Signed-off-by: Michal Skalski --- common/puppet-opnfv/manifests/templates/dockerfile/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/puppet-opnfv/manifests/templates/dockerfile/Dockerfile') diff --git a/common/puppet-opnfv/manifests/templates/dockerfile/Dockerfile b/common/puppet-opnfv/manifests/templates/dockerfile/Dockerfile index 6b2f241..5241a80 100644 --- a/common/puppet-opnfv/manifests/templates/dockerfile/Dockerfile +++ b/common/puppet-opnfv/manifests/templates/dockerfile/Dockerfile @@ -79,4 +79,4 @@ EXPOSE 52150 EXPOSE 36826 # set the ENTRYPOINT - An entry point allows us to run this container as an exectuable -CMD ["/etc/init.d/start_odl_docker.sh"] +CMD ["/etc/init.d/start_odl_docker_container.sh"] -- cgit 1.2.3-korg