summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-01 10:28:29 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-01 10:28:29 -0500
commit051b84554593b65b0e86cf2921f49361801f3623 (patch)
tree7f7fcbc0e7bd9841c4d28d608c76d704d9801acc
parentd19a54ccfb7a2a927e9988af638acb566573f433 (diff)
parent25fd1cd150b10b7362e3dfa2bfe714077bcd99cc (diff)
downloadopenshift-051b84554593b65b0e86cf2921f49361801f3623.tar.gz
openshift-051b84554593b65b0e86cf2921f49361801f3623.tar.bz2
openshift-051b84554593b65b0e86cf2921f49361801f3623.tar.xz
openshift-051b84554593b65b0e86cf2921f49361801f3623.zip
Merge pull request #1304 from jprovaznik/sleep
Give openvswitch container some time to start
-rw-r--r--roles/openshift_node/templates/openvswitch.docker.service1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/openvswitch.docker.service b/roles/openshift_node/templates/openvswitch.docker.service
index 0b42ca6d5..6c02b26bf 100644
--- a/roles/openshift_node/templates/openvswitch.docker.service
+++ b/roles/openshift_node/templates/openvswitch.docker.service
@@ -6,6 +6,7 @@ PartOf=docker.service
[Service]
ExecStartPre=-/usr/bin/docker rm -f openvswitch
ExecStart=/usr/bin/docker run --name openvswitch --rm --privileged --net=host --pid=host -v /lib/modules:/lib/modules -v /run:/run -v /sys:/sys:ro -v /etc/origin/openvswitch:/etc/openvswitch {{ openshift.node.ovs_image }}
+ExecStartPost=/usr/bin/sleep 5
ExecStop=/usr/bin/docker stop openvswitch
Restart=always