From b70e038fe526972af73d99fe9f3574bed7a31119 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 13 Jul 2022 22:57:43 +0900
Subject: [PATCH] Remove usage of $::os_service_default

... because it was deprecated during Yoga cycle by [1].

[1] fb9a08d9726b79d2dcca34dab00150a1b62ef529

Change-Id: I16ed985cc1eee3c923bcd1e5ecdc2266658bed8c
---
 manifests/dpdk.pp                                  | 14 +++-----------
 manifests/ovs.pp                                   | 14 +++-----------
 ...remove-os_service_default-160de5d54609083a.yaml |  5 +++++
 3 files changed, 11 insertions(+), 22 deletions(-)
 create mode 100644 releasenotes/notes/remove-os_service_default-160de5d54609083a.yaml

diff --git a/manifests/dpdk.pp b/manifests/dpdk.pp
index 7f3b5ec0..f78ab56d 100644
--- a/manifests/dpdk.pp
+++ b/manifests/dpdk.pp
@@ -145,17 +145,9 @@ class vswitch::dpdk (
     }
   }
 
-  if is_service_default($vlan_limit) {
-    warning('Usage of $::os_service_default for vlan_limit is deprecated. Use undef instead')
-    vs_config { 'other_config:vlan-limit':
-      ensure => absent,
-      wait   => true,
-    }
-  } else {
-    vs_config { 'other_config:vlan-limit':
-      value => $vlan_limit,
-      wait  => true,
-    }
+  vs_config { 'other_config:vlan-limit':
+    value => $vlan_limit,
+    wait  => true,
   }
 
   if $enable_tso {
diff --git a/manifests/ovs.pp b/manifests/ovs.pp
index 9451c5ce..5b4a3eee 100644
--- a/manifests/ovs.pp
+++ b/manifests/ovs.pp
@@ -67,17 +67,9 @@ class vswitch::ovs(
     }
   }
 
-  if is_service_default($vlan_limit) {
-    warning('Usage of $::os_service_default for vlan_limit is deprecated. Use undef instead')
-    vs_config { 'other_config:vlan-limit':
-      ensure => absent,
-      wait   => true,
-    }
-  } else {
-    vs_config { 'other_config:vlan-limit':
-      value => $vlan_limit,
-      wait  => true,
-    }
+  vs_config { 'other_config:vlan-limit':
+    value => $vlan_limit,
+    wait  => true,
   }
 
   create_resources('vs_config', $vs_config)
diff --git a/releasenotes/notes/remove-os_service_default-160de5d54609083a.yaml b/releasenotes/notes/remove-os_service_default-160de5d54609083a.yaml
new file mode 100644
index 00000000..a577baa6
--- /dev/null
+++ b/releasenotes/notes/remove-os_service_default-160de5d54609083a.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The following parameters no longer accepts ``$::os_service_default`` as
+    the special value to use default. Use ``undef`` instead.