summaryrefslogtreecommitdiffstats
path: root/fuel/build/f_odl_docker/puppet
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
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')
-rw-r--r--fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_docker.pp14
-rwxr-xr-xfuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh15
2 files changed, 24 insertions, 5 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'],
+ }
+ }
}
}
}
diff --git a/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh b/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh
index 0b4fd46..0bddd20 100755
--- a/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh
+++ b/fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh
@@ -24,7 +24,7 @@ DEV=1
MATCH_PORT=1
-LOCALPATH=/opt/opnfv/odl_docker
+LOCALPATH=/opt/opnfv/odl
DOCKERBINNAME=docker-latest
DOCKERIMAGENAME=odl_docker_image.tar
DNS=8.8.8.8
@@ -54,6 +54,10 @@ else
echo "Starting Docker in Daemon mode"
chmod +x $LOCALPATH/$DOCKERBINNAME
$LOCALPATH/$DOCKERBINNAME -d &
+
+ # wait until docker will be fully initialized
+ # before any further action against just started docker
+ sleep 5
fi
@@ -72,17 +76,18 @@ echo " starting up ODL - DLUX and Mapping Ports"
if [ "$MATCH_PORT" -eq "1" ]
then
echo "Starting up Docker..."
- docker rm odl_docker
+ $LOCALPATH/$DOCKERBINNAME rm odl_docker
+fi
if [ "$ENABLE_SHELL" -eq "1" ];
then
echo "Starting Container in Interactive Mode (/bin/bash will be provided, you will need to run ./start_odl_docker.sh inside the container yourself)"
- docker run --name odl_docker -p 8181:8181 -p 8185:8185 -p 9000:9000 -p 1099:1099 -p 8101:8101 -p 6633:6633 -p 43506:43506 -p 44444:44444 -p 6653:6653 -p 12001:12001 -p 6400:6400 -p 8080:8080 -p 7800:7800 -p 55130:55130 -p 52150:52150 -p 36826:26826 -i -d -t loving_daniel /bin/bash
+ $LOCALPATH/$DOCKERBINNAME run --name odl_docker -p 8181:8181 -p 8185:8185 -p 9000:9000 -p 1099:1099 -p 8101:8101 -p 6633:6633 -p 43506:43506 -p 44444:44444 -p 6653:6653 -p 12001:12001 -p 6400:6400 -p 6640:6640 -p 8080:8080 -p 7800:7800 -p 55130:55130 -p 52150:52150 -p 36826:26826 -i -t loving_daniel /bin/bash
else
echo "Starting Conatiner in Daemon mode - no shell will be provided and docker attach will not provide shell)"
- docker run --name odl_docker -p 8181:8181 -p 8185:8185 -p 9000:9000 -p 1099:1099 -p 8101:8101 -p 6633:6633 -p 43506:43506 -p 44444:44444 -p 6653:6653 -p 12001:12001 -p 6400:6400 -p 8080:8080 -p 7800:7800 -p 55130:55130 -p 52150:52150 -p 36826:26826 -i -d -t loving_daniel
+ $LOCALPATH/$DOCKERBINNAME run --name odl_docker -p 8181:8181 -p 8185:8185 -p 9000:9000 -p 1099:1099 -p 8101:8101 -p 6633:6633 -p 43506:43506 -p 44444:44444 -p 6653:6653 -p 12001:12001 -p 6400:6400 -p 6640:6640 -p 8080:8080 -p 7800:7800 -p 55130:55130 -p 52150:52150 -p 36826:26826 -i -d -t loving_daniel
echo "should see the process listed here in docker ps -a"
- docker ps -a;
+ $LOCALPATH/$DOCKERBINNAME ps -a;
echo "Match Port enabled, you can reach the DLUX login at: "
echo "http://$HOST_IP:8181/dlux.index.html"
fi