summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-16 16:38:50 -0400
committerGitHub <noreply@github.com>2017-03-16 16:38:50 -0400
commitd7f70501e32e0fbaec5396c9435c6f78a331b180 (patch)
tree57f3269db23f035e6365a27210fbe54aeb8bc4e5
parent4dda3a72ba8e6a97b710b69f97af9ec624cfb919 (diff)
parentfc31716db9653bbef422c1a944395201da1b83a2 (diff)
downloadopenshift-d7f70501e32e0fbaec5396c9435c6f78a331b180.tar.gz
openshift-d7f70501e32e0fbaec5396c9435c6f78a331b180.tar.bz2
openshift-d7f70501e32e0fbaec5396c9435c6f78a331b180.tar.xz
openshift-d7f70501e32e0fbaec5396c9435c6f78a331b180.zip
Merge pull request #3674 from sdodson/fix-ovs-race
Merged by openshift-bot
-rw-r--r--roles/openshift_node/templates/openshift.docker.node.service2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/openshift.docker.node.service b/roles/openshift_node/templates/openshift.docker.node.service
index 6ec88f85e..b4fd5aeb0 100644
--- a/roles/openshift_node/templates/openshift.docker.node.service
+++ b/roles/openshift_node/templates/openshift.docker.node.service
@@ -6,6 +6,8 @@ PartOf=docker.service
Requires=docker.service
{% if openshift.common.use_openshift_sdn %}
Requires=openvswitch.service
+After=ovsdb-server.service
+After=ovs-vswitchd.service
{% endif %}
Wants={{ openshift.common.service_type }}-master.service
Requires={{ openshift.common.service_type }}-node-dep.service