summaryrefslogtreecommitdiffstats
path: root/fuel/build/f_odl_docker/puppet/modules/opnfv/manifests
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2015-03-31 09:27:25 +0200
committerMichal Skalski <mskalski@mirantis.com>2015-04-02 11:47:35 +0200
commit1ea54d02b8282d991c717d87391239613ec663cd (patch)
tree5790e1d4512ef5d227830cf76a27c7b844faeada /fuel/build/f_odl_docker/puppet/modules/opnfv/manifests
parent3eed12baa4753bf7f1eadc2b99465af38086f14f (diff)
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 <mskalski@mirantis.com>
Diffstat (limited to 'fuel/build/f_odl_docker/puppet/modules/opnfv/manifests')
-rw-r--r--fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp14
1 files changed, 14 insertions, 0 deletions
diff --git a/fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp b/fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp
index ae24460..922ab41 100644
--- a/fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp
+++ b/fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp
@@ -35,6 +35,20 @@ class opnfv::odl_docker
source => "/etc/puppet/modules/opnfv/scripts/start_odl_container.sh",
mode => 750,
}
+
+ # fix failed to find the cgroup root issue
+ # https://github.com/docker/docker/issues/8791
+ if $::operatingsystem == 'Ubuntu' {
+ package {'cgroup-lite':
+ ensure => present,
+ }
+
+ service {'cgroup-lite':
+ ensure => running,
+ enable => true,
+ require => Package['cgroup-lite'],
+ }
+ }
}
}
}