From 30b58bfa277820e0d41a7dc5edd06d8b4ff53500 Mon Sep 17 00:00:00 2001
From: Dirk Mueller
Date: Fri, 9 Dec 2016 00:58:54 +0100
Subject: [PATCH] Update openvswitch restart for suse
Starting with SLE12 SP2 and with openSUSE Leap the distro-shipped
openvswitch is the normal systemd openvswitch.service service file
and no longer the older openvswitch-switch Sysv5 init script. Add
a special case for that.
Change-Id: I5152f2585c3d4d18853988d6290039d6b1713b99
---
lib/neutron_plugins/ovs_base | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
index 10043252d6..62a4d00bcd 100644
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -69,7 +69,11 @@ function _neutron_ovs_base_install_agent_packages {
restart_service openvswitch
sudo systemctl enable openvswitch
elif is_suse; then
- restart_service openvswitch-switch
+ if [[ $DISTRO == "sle12" ]] && [[ $os_RELEASE -lt 12.2 ]]; then
+ restart_service openvswitch-switch
+ else
+ restart_service openvswitch
+ fi
fi
}