From 7f805f9a0c41477365dd88b0ac73f0d221bd654a Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 17 May 2017 09:24:20 +0200
Subject: node, systemd: change Requires to Wants for openvswitch
Sometimes the node container is not started on a container-engine
restart. Use a weaker dependency on openvswitch that is causing this issue
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1451192
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
roles/openshift_node/templates/openshift.docker.node.service | 2 +-
roles/openshift_node_upgrade/templates/openshift.docker.node.service | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'roles')
diff --git a/roles/openshift_node/templates/openshift.docker.node.service b/roles/openshift_node/templates/openshift.docker.node.service
index 06782cb8b..d89b64b06 100644
--- a/roles/openshift_node/templates/openshift.docker.node.service
+++ b/roles/openshift_node/templates/openshift.docker.node.service
@@ -5,7 +5,7 @@ After=openvswitch.service
PartOf={{ openshift.docker.service_name }}.service
Requires={{ openshift.docker.service_name }}.service
{% if openshift.common.use_openshift_sdn %}
-Requires=openvswitch.service
+Wants=openvswitch.service
After=ovsdb-server.service
After=ovs-vswitchd.service
{% endif %}
diff --git a/roles/openshift_node_upgrade/templates/openshift.docker.node.service b/roles/openshift_node_upgrade/templates/openshift.docker.node.service
index a9b393652..2a099301a 100644
--- a/roles/openshift_node_upgrade/templates/openshift.docker.node.service
+++ b/roles/openshift_node_upgrade/templates/openshift.docker.node.service
@@ -5,7 +5,7 @@ After=openvswitch.service
PartOf={{ openshift.docker.service_name }}.service
Requires={{ openshift.docker.service_name }}.service
{% if openshift.common.use_openshift_sdn %}
-Requires=openvswitch.service
+Wants=openvswitch.service
{% endif %}
Wants={{ openshift.common.service_type }}-master.service
Requires={{ openshift.common.service_type }}-node-dep.service
--
cgit v1.2.3