summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/templates
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-15 16:47:37 -0400
committerScott Dodson <sdodson@redhat.com>2017-03-15 16:53:42 -0400
commitfc31716db9653bbef422c1a944395201da1b83a2 (patch)
treec77a2f33488a920b57f14b62e8ab6e8df7b10746 /roles/openshift_node/templates
parent91ca8e8134bc0af84478125174c58f0fb2b8943c (diff)
downloadopenshift-fc31716db9653bbef422c1a944395201da1b83a2.tar.gz
openshift-fc31716db9653bbef422c1a944395201da1b83a2.tar.bz2
openshift-fc31716db9653bbef422c1a944395201da1b83a2.tar.xz
openshift-fc31716db9653bbef422c1a944395201da1b83a2.zip
Fix containerized openvswitch race
Diffstat (limited to 'roles/openshift_node/templates')
-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