diff --git a/deployment/deprecated/kernel/kernel-baremetal-puppet.yaml b/deployment/deprecated/kernel/kernel-baremetal-puppet.yaml index 7415dc8b99..8eb0c0ac1d 100644 --- a/deployment/deprecated/kernel/kernel-baremetal-puppet.yaml +++ b/deployment/deprecated/kernel/kernel-baremetal-puppet.yaml @@ -68,7 +68,7 @@ parameters: ARP cache. The garbage collector will always run if there are more than this number of entries in the cache. type: number - InotifyIntancesMax: + InotifyInstancesMax: default: 1024 description: Configures sysctl fs.inotify.max_user_instances key type: number @@ -224,7 +224,7 @@ outputs: value: {get_param: BridgeNfCallIp6Tables} # set inotify value for neutron/dnsmasq scale fs.inotify.max_user_instances: - value: {get_param: InotifyIntancesMax} + value: {get_param: InotifyInstancesMax} - {get_attr: [RoleParametersValue, value, extra_sysctl_settings]} step_config: | diff --git a/deployment/kernel/kernel-baremetal-ansible.yaml b/deployment/kernel/kernel-baremetal-ansible.yaml index 841367ff00..4b94e34206 100644 --- a/deployment/kernel/kernel-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-baremetal-ansible.yaml @@ -68,7 +68,7 @@ parameters: ARP cache. The garbage collector will always run if there are more than this number of entries in the cache. type: number - InotifyIntancesMax: + InotifyInstancesMax: default: 1024 description: Configures sysctl fs.inotify.max_user_instances key type: number @@ -103,8 +103,23 @@ 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]} resources: # Merging role-specific parameters (RoleParameters) with the default parameters. @@ -168,5 +183,9 @@ outputs: net.bridge.bridge-nf-call-ip6tables: value: {get_param: BridgeNfCallIp6Tables} fs.inotify.max_user_instances: - value: {get_param: InotifyIntancesMax} + value: + if: + - is_inotify_intances_max_default + - {get_param: InotifyInstancesMax} + - {get_param: InotifyIntancesMax} - {get_attr: [RoleParametersValue, value, extra_sysctl_settings]} diff --git a/releasenotes/notes/deprecate-misspelt-param-34fee48da69fc480.yaml b/releasenotes/notes/deprecate-misspelt-param-34fee48da69fc480.yaml new file mode 100644 index 0000000000..1b683e327f --- /dev/null +++ b/releasenotes/notes/deprecate-misspelt-param-34fee48da69fc480.yaml @@ -0,0 +1,12 @@ +--- +upgrade: + - | + If deprecated parameter ``InotifyIntancesMax`` is used in deployment, + then user should use parameter ``InotifyInstancesMax`` with correct spelling + during upgrade. +deprecations: + - | + Deprecated ``InotifyIntancesMax`` parameter as it is misspelt. +fixes: + - | + Added new parameter with correct spelling ``InotifyInstancesMax``.