From 55af0b29fb075cf4eb1e3dccde8f0b3c73906fc4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 19 Apr 2022 10:13:07 +0900
Subject: [PATCH] Remove remaining parameter for Dynamic Kernel Module Support

... because it was deprecated during Yoga cycle[1] and has had no
effect since then.

[1] 3ff72b5736d94ff32535ab345df4cb588c95286f

Change-Id: I7a24045ee414a0ae81aa7093621ce07d791e5e31
---
 manifests/ovs.pp                                | 17 -----------------
 .../remove-dkms_ensure-5022f7fddf0caefb.yaml    |  4 ++++
 2 files changed, 4 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/remove-dkms_ensure-5022f7fddf0caefb.yaml

diff --git a/manifests/ovs.pp b/manifests/ovs.pp
index 6ced0f0e..f9af3b2c 100644
--- a/manifests/ovs.pp
+++ b/manifests/ovs.pp
@@ -30,34 +30,17 @@
 #   NOTE: that the configuration MUST NOT be already handled by this module
 #   or Puppet catalog compilation will fail with duplicate resources.
 #
-# DEPRECATED PARAMETERS
-#
-# [*dkms_ensure*]
-#   (optional) on debian/wheezy, ubuntu/precise, ubuntu/trusty and
-#   ubuntu/utopic dkms (Dynamic Kernel Module Support) is used to
-#   have a kernel module which matches the running kernel.
-#   In newer distributions (which ship with a newer kernel) dkms
-#   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 undef.
-#
 class vswitch::ovs(
   $package_ensure    = 'present',
   $enable_hw_offload = false,
   $disable_emc       = false,
   $vlan_limit        = undef,
   $vs_config         = {},
-  $dkms_ensure       = undef,
 ) {
 
   include vswitch::params
   validate_legacy(Hash, 'validate_hash', $vs_config)
 
-  if $dkms_ensure {
-    warning('The dkms_ensure parameter is deprecated and has no effect')
-  }
-
   if $enable_hw_offload {
     vs_config { 'other_config:hw-offload':
       value   => true,
diff --git a/releasenotes/notes/remove-dkms_ensure-5022f7fddf0caefb.yaml b/releasenotes/notes/remove-dkms_ensure-5022f7fddf0caefb.yaml
new file mode 100644
index 00000000..dd39f15f
--- /dev/null
+++ b/releasenotes/notes/remove-dkms_ensure-5022f7fddf0caefb.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``vswitch::ovs::dkms_ensure`` parameter has been removed.