openstack/devstack
Code Issues Proposed changes

Merge "Do not install openvswitch-datapath-dkms on Ubuntu 14.04"

Browse Source
This commit is contained in:
Jenkins 2014-06-23 18:39:24 +00:00 committed by Gerrit Code Review
commit 4fcda870e6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/neutron_plugins/ovs_base
View File

@ -38,7 +38,14 @@ function _neutron_ovs_base_install_agent_packages {
# FIXME add to ``files/apts/neutron``, but don't install if not needed! # FIXME add to ``files/apts/neutron``, but don't install if not needed!
if is_ubuntu; then if is_ubuntu; then
kernel_version=`cat /proc/version | cut -d " " -f3` 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 elif is_fedora; then
install_package openvswitch install_package openvswitch
# Ensure that the service is started # Ensure that the service is started