summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJan Provaznik <jprovazn@redhat.com>2016-01-28 14:23:29 +0100
committerJan Provaznik <jprovazn@redhat.com>2016-01-29 14:35:19 +0100
commit25fd1cd150b10b7362e3dfa2bfe714077bcd99cc (patch)
tree53b43f18c5338bbe4557ac528ee9e587914d287b /roles
parent0658eea31bcf7db761463a9d734b07b4a5984e0f (diff)
downloadopenshift-25fd1cd150b10b7362e3dfa2bfe714077bcd99cc.tar.gz
openshift-25fd1cd150b10b7362e3dfa2bfe714077bcd99cc.tar.bz2
openshift-25fd1cd150b10b7362e3dfa2bfe714077bcd99cc.tar.xz
openshift-25fd1cd150b10b7362e3dfa2bfe714077bcd99cc.zip
Give openvswitch container some time to start
It's possible that openshift containers are started sooner than openvswitch starts/sets networking (this typically happens when docker service is restarted).
Diffstat (limited to 'roles')
-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