Merge "Fix typo in parameter name"
This commit is contained in:
commit
b0a75f1db0
|
@ -68,7 +68,7 @@ parameters:
|
||||||
ARP cache. The garbage collector will always run if there
|
ARP cache. The garbage collector will always run if there
|
||||||
are more than this number of entries in the cache.
|
are more than this number of entries in the cache.
|
||||||
type: number
|
type: number
|
||||||
InotifyIntancesMax:
|
InotifyInstancesMax:
|
||||||
default: 1024
|
default: 1024
|
||||||
description: Configures sysctl fs.inotify.max_user_instances key
|
description: Configures sysctl fs.inotify.max_user_instances key
|
||||||
type: number
|
type: number
|
||||||
|
@ -224,7 +224,7 @@ outputs:
|
||||||
value: {get_param: BridgeNfCallIp6Tables}
|
value: {get_param: BridgeNfCallIp6Tables}
|
||||||
# set inotify value for neutron/dnsmasq scale
|
# set inotify value for neutron/dnsmasq scale
|
||||||
fs.inotify.max_user_instances:
|
fs.inotify.max_user_instances:
|
||||||
value: {get_param: InotifyIntancesMax}
|
value: {get_param: InotifyInstancesMax}
|
||||||
- {get_attr: [RoleParametersValue, value, extra_sysctl_settings]}
|
- {get_attr: [RoleParametersValue, value, extra_sysctl_settings]}
|
||||||
|
|
||||||
step_config: |
|
step_config: |
|
||||||
|
|
|
@ -68,7 +68,7 @@ parameters:
|
||||||
ARP cache. The garbage collector will always run if there
|
ARP cache. The garbage collector will always run if there
|
||||||
are more than this number of entries in the cache.
|
are more than this number of entries in the cache.
|
||||||
type: number
|
type: number
|
||||||
InotifyIntancesMax:
|
InotifyInstancesMax:
|
||||||
default: 1024
|
default: 1024
|
||||||
description: Configures sysctl fs.inotify.max_user_instances key
|
description: Configures sysctl fs.inotify.max_user_instances key
|
||||||
type: number
|
type: number
|
||||||
|
@ -103,8 +103,23 @@ parameters:
|
||||||
tags:
|
tags:
|
||||||
- role_specific
|
- 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:
|
conditions:
|
||||||
ipv6_disabled: {equals: [{get_param: KernelDisableIPv6}, 1]}
|
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:
|
resources:
|
||||||
# Merging role-specific parameters (RoleParameters) with the default parameters.
|
# Merging role-specific parameters (RoleParameters) with the default parameters.
|
||||||
|
@ -168,5 +183,9 @@ outputs:
|
||||||
net.bridge.bridge-nf-call-ip6tables:
|
net.bridge.bridge-nf-call-ip6tables:
|
||||||
value: {get_param: BridgeNfCallIp6Tables}
|
value: {get_param: BridgeNfCallIp6Tables}
|
||||||
fs.inotify.max_user_instances:
|
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]}
|
- {get_attr: [RoleParametersValue, value, extra_sysctl_settings]}
|
||||||
|
|
|
@ -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``.
|
Loading…
Reference in New Issue