rhel-systemd: Delay shutting down the services

During testing it was found that systemd would consider the openvswitch service as a part of networking component, but the dependent services of ovs-vswitchd and ovsdb-server were not likewise considered. This leads to some strange race conditions, observed when using NFS over TCP, while shutting down systems. Fixes: 84ad120 ("rhel: Improved Systemd Integration") Co-authored-by: Flavio Leitner <[email protected]> Signed-off-by: Aaron Conole <[email protected]> Signed-off-by: Flavio Leitner <[email protected]> Signed-off-by: Russell Bryant <[email protected]>
nicboul · Oct 15, 2016 · 36af136 · 36af136
1 parent b2b2427
commit 36af136
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/rhel/usr_lib_systemd_system_openvswitch.service b/rhel/usr_lib_systemd_system_openvswitch.service
@@ -1,5 +1,7 @@
 [Unit]
 Description=Open vSwitch
+Before=network.target network.service
+After=network-pre.target
 PartOf=network.target
 BindsTo=ovsdb-server.service
 BindsTo=ovs-vswitchd.service

diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service b/rhel/usr_lib_systemd_system_ovs-vswitchd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Open vSwitch Forwarding Unit
-After=ovsdb-server.service
+After=ovsdb-server.service network-pre.target
+Before=network.target network.service
 Requires=ovsdb-server.service
 ReloadPropagatedFrom=ovsdb-server.service
 AssertPathIsReadWrite=/var/run/openvswitch/db.sock

diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Open vSwitch Database Unit
-After=syslog.target
+After=syslog.target network-pre.target
+Before=network.target network.service
 ReloadPropagatedFrom=openvswitch.service
 PartOf=openvswitch.service