From 0164d95a2457dccc61163fde984abf7c80456624 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 20 Jul 2017 15:42:07 -0500 Subject: node: make node service PartOf=openvswitch.service when openshift-sdn is used Commit 7f805f9a0c41477365dd88b0ac73f0d221bd654a causes the behavior seen in https://bugzilla.redhat.com/show_bug.cgi?id=1453113 because openshift-node is no longer restarted when openvswitch is, due to the change from Requires to Wants. Turns out that making the openshift node service PartOf the OVS service can achieve the same result and ensure openshift-node gets restarted whenever OVS does, which ensures that networking doesn't break underneath the node. Suggested by Giuseppe Scrivano --- roles/openshift_node/templates/openshift.docker.node.service | 1 + roles/openshift_node_upgrade/templates/openshift.docker.node.service | 1 + 2 files changed, 2 insertions(+) diff --git a/roles/openshift_node/templates/openshift.docker.node.service b/roles/openshift_node/templates/openshift.docker.node.service index 310d8b29d..561aa01f4 100644 --- a/roles/openshift_node/templates/openshift.docker.node.service +++ b/roles/openshift_node/templates/openshift.docker.node.service @@ -6,6 +6,7 @@ PartOf={{ openshift.docker.service_name }}.service Requires={{ openshift.docker.service_name }}.service {% if openshift_node_use_openshift_sdn %} Wants=openvswitch.service +PartOf=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 864e4b5d6..07d1ebc3c 100644 --- a/roles/openshift_node_upgrade/templates/openshift.docker.node.service +++ b/roles/openshift_node_upgrade/templates/openshift.docker.node.service @@ -6,6 +6,7 @@ PartOf={{ openshift.docker.service_name }}.service Requires={{ openshift.docker.service_name }}.service {% if openshift_use_openshift_sdn %} Wants=openvswitch.service +PartOf=openvswitch.service After=ovsdb-server.service After=ovs-vswitchd.service {% endif %} -- cgit v1.2.3