commit c95ca63ae3acdc3ebc36ab4efdfd874993ce72cc
author Jenkins <jenkins@review.openstack.org> Mon Dec 12 16:09:14 2016 +0000
committer Gerrit Code Review <review@openstack.org> Mon Dec 12 16:09:14 2016 +0000
tree 8a630910ae740e85b23c60a35139f96809a51f96
parent 97b07a880f067f413197eb6b09a4ca96b2e5493e
parent 30b58bfa277820e0d41a7dc5edd06d8b4ff53500

Merge "Update openvswitch restart for suse"

lib/neutron_plugins/ovs_base

diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
index 1004325..62a4d00 100644
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -69,7 +69,11 @@
         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
 }