From ce03d102879755581222d1171e24d22654ff9ea4 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Mon, 7 Apr 2014 17:01:53 +0200 Subject: [PATCH] Fix openvswitch package and service names for openSUSE Change-Id: Iaf173422e4d009bdd7ed7ed79af2269c44039060 --- files/rpms-suse/opendaylight | 1 - lib/neutron_plugins/ovs_base | 3 +-- lib/opendaylight | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/files/rpms-suse/opendaylight b/files/rpms-suse/opendaylight index d6c7146331..f7fafffae1 100644 --- a/files/rpms-suse/opendaylight +++ b/files/rpms-suse/opendaylight @@ -1,4 +1,3 @@ openvswitch # NOPRIME -openvswitch-controller # NOPRIME openvswitch-switch # NOPRIME diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base index ae7f815aba..1e293a187e 100644 --- a/lib/neutron_plugins/ovs_base +++ b/lib/neutron_plugins/ovs_base @@ -44,9 +44,8 @@ function _neutron_ovs_base_install_agent_packages { # Ensure that the service is started restart_service openvswitch elif is_suse; then - install_package openvswitch + install_package openvswitch-switch restart_service openvswitch-switch - restart_service openvswitch-controller fi } diff --git a/lib/opendaylight b/lib/opendaylight index 1022e2c061..3a8f40f029 100644 --- a/lib/opendaylight +++ b/lib/opendaylight @@ -117,9 +117,8 @@ function install_opendaylight-compute { # Ensure that the service is started restart_service openvswitch elif is_suse; then - install_package openvswitch + install_package openvswitch-switch restart_service openvswitch-switch - restart_service openvswitch-controller fi }