From e2b9b630d5d628863eb4588ef3830db99321f871 Mon Sep 17 00:00:00 2001
From: Rajesh Tailor <ratailor@redhat.com>
Date: Mon, 30 May 2022 19:00:17 +0530
Subject: [PATCH] Remove deprecated parameter

This change removes deprecated parameter 'InotifyIntancesMax'.

Change-Id: Ib01ab12401a71ae3e52ff7ae5511694613340842
---
 .../kernel/kernel-baremetal-ansible.yaml      | 20 +------------------
 ...emove-misspelt-param-eeeea6fab711932e.yaml |  5 +++++
 2 files changed, 6 insertions(+), 19 deletions(-)
 create mode 100644 releasenotes/notes/remove-misspelt-param-eeeea6fab711932e.yaml

diff --git a/deployment/kernel/kernel-baremetal-ansible.yaml b/deployment/kernel/kernel-baremetal-ansible.yaml
index 71c5511e4c..2725d50e2c 100644
--- a/deployment/kernel/kernel-baremetal-ansible.yaml
+++ b/deployment/kernel/kernel-baremetal-ansible.yaml
@@ -121,22 +121,8 @@ parameters:
     tags:
       - role_specific
 
-  # DEPRECATED: the following options are deprecated and are currently maintained
-  # for backwards compatibility. They will be removed in future release.
-  InotifyIntancesMax:
-    default: 1024
-    description: Configures sysctl fs.inotify.max_user_instances key
-    type: number
-parameter_groups:
-- label: deprecated
-  description: Do not use deprecated params, they will be removed.
-  parameters:
-  - InotifyIntancesMax
-
 conditions:
   ipv6_disabled: {equals: [{get_param: KernelDisableIPv6}, 1]}
-  # TODO: remove when misseplt/deprecated parameter InotifyIntancesMax is removed.
-  is_inotify_intances_max_default: {equals: [{get_param: InotifyIntancesMax}, 1024]}
   fs_aio_max_number_set:
     and:
       - not: {equals: [{get_param: [RoleParameters, FsAioMaxNumber]}, 0]}
@@ -212,11 +198,7 @@ outputs:
               net.bridge.bridge-nf-call-ip6tables:
                 value: {get_param: BridgeNfCallIp6Tables}
               fs.inotify.max_user_instances:
-                value:
-                  if:
-                    - is_inotify_intances_max_default
-                    - {get_param: InotifyInstancesMax}
-                    - {get_param: InotifyIntancesMax}
+                value: {get_param: InotifyInstancesMax}
             - if:
                 - fs_aio_max_number_set
                 - fs.aio-max-nr:
diff --git a/releasenotes/notes/remove-misspelt-param-eeeea6fab711932e.yaml b/releasenotes/notes/remove-misspelt-param-eeeea6fab711932e.yaml
new file mode 100644
index 0000000000..040d643420
--- /dev/null
+++ b/releasenotes/notes/remove-misspelt-param-eeeea6fab711932e.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``InotifyIntancesMax`` parameter has been removed.
+    The ``InotifyInstancesMax`` parameter should be used instead.