From c48afe4bc0220f09f64a1b011e790a4595615a0c Mon Sep 17 00:00:00 2001
From: Henry Gessau <gessau@cisco.com>
Date: Fri, 20 Jun 2014 17:29:44 -0400
Subject: [PATCH] Do not install openvswitch-datapath-dkms on Ubuntu 14.04
Change-Id: I8c58d998011427a202c79c45b87b5eca5ceaaa71
Closes-bug: #1331111
---
lib/neutron_plugins/ovs_base | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
index e1c3c3f116..e13cbb1b18 100644
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -38,7 +38,14 @@ function _neutron_ovs_base_install_agent_packages {
# FIXME add to ``files/apts/neutron``, but don't install if not needed!
if is_ubuntu; then
kernel_version=`cat /proc/version | cut -d " " -f3`
- install_package make fakeroot dkms openvswitch-switch openvswitch-datapath-dkms linux-headers-$kernel_version
+ ovs_packages="make fakeroot dkms openvswitch-switch"
+ # From kernel 3.13 on, openvswitch-datapath-dkms is not needed
+ kernel_major_minor=`echo $kernel_version | cut -d. -f1-2`
+ if [ `vercmp_numbers "$kernel_major_minor" "3.13"` -lt "0" ]; then
+ ovs_packages="$ovs_packages openvswitch-datapath-dkms"
+ fi
+ ovs_packages="$ovs_packages linux-headers-$kernel_version"
+ install_package $ovs_packages
elif is_fedora; then
install_package openvswitch
# Ensure that the service is started