set dkms_ensure to False by default

In recent releases of Ubuntu, dkms packaging is not useful anymore, see:
https://javacruft.wordpress.com/2014/03/03/which-open-vswitch/

Switch dkms_ensure to False by default, so we can deploy OVS out of the
box on Ubuntu Xenial. This patch should not break Trusty deployments.

Change-Id: Ie97134e5e1053e4fa6135033e907183bb4fc293a
This commit is contained in:
Emilien Macchi 2016-05-02 12:19:16 -04:00
parent dab2f37b2b
commit f4d19a7a07
3 changed files with 13 additions and 9 deletions

View File

@ -17,11 +17,11 @@
# is not available anymore for openvswitch.
# For RedHat this parameter is ignored.
# If you like turn off dkms on Debian/Ubuntu set to
# false. defaults to true.
# false. defaults to false.
class vswitch::ovs(
$package_ensure = 'present',
$dkms_ensure = true,
$dkms_ensure = false,
) {
include ::vswitch::params

View File

@ -0,0 +1,5 @@
---
deprecations:
- Do not deploy openvswitch-datapath-dkms by default. In recent releases of
Ubuntu, openvswitch-datapath-dkms packaging is not needed anymore, so we set dkms_ensure
to False by default from now.

View File

@ -4,7 +4,6 @@ describe 'vswitch::ovs' do
let :default_params do {
:package_ensure => 'present',
:dkms_ensure => true,
}
end
@ -149,13 +148,13 @@ describe 'vswitch::ovs' do
let :platform_params do debian_platform_params end
it_configures 'vswitch ovs'
it_configures 'install dkms'
it_configures 'do not install dkms'
end
context 'on Debian with parameters' do
let :params do {
:package_ensure => 'latest',
:dkms_ensure => false,
:dkms_ensure => true,
}
end
@ -168,7 +167,7 @@ describe 'vswitch::ovs' do
let :platform_params do debian_platform_params end
it_configures 'vswitch ovs'
it_configures 'do not install dkms'
it_configures 'install dkms'
end
context 'on Ubuntu with default parameters' do
@ -183,13 +182,13 @@ describe 'vswitch::ovs' do
let :platform_params do ubuntu_platform_params end
it_configures 'vswitch ovs'
it_configures 'install dkms'
it_configures 'do not install dkms'
end
context 'on Ubuntu with parameters' do
let :params do {
:package_ensure => 'latest',
:dkms_ensure => false,
:dkms_ensure => true,
}
end
@ -202,7 +201,7 @@ describe 'vswitch::ovs' do
let :platform_params do ubuntu_platform_params end
it_configures 'vswitch ovs'
it_configures 'do not install dkms'
it_configures 'install dkms'
end
context 'on FreeBSD with default parameters' do