kernel: make ExtraKernelModules and ExtraSysctlSettings role-specific
Allow to configure extra Kernel modules and extra sysctl settings per role
and not only global to the whole deployment.
The two parameters that can be role-specific are ExtraKernelModules and
ExtraSysctlSettings.
Depends-On: I2b26ce4f9d19dbf66da1b4382d7ffd653e67a92e
Change-Id: Iaafd0133df7ecd01a338f1b4deb3b159c2d9c6f1
(cherry picked from commit da1ed3d19c
)
This commit is contained in:
parent
a2d529e108
commit
295f22bf84
@ -72,11 +72,31 @@ parameters:
|
|||||||
default: {}
|
default: {}
|
||||||
description: Hash of extra Kernel modules to load.
|
description: Hash of extra Kernel modules to load.
|
||||||
type: json
|
type: json
|
||||||
|
tags:
|
||||||
|
- role_specific
|
||||||
ExtraSysctlSettings:
|
ExtraSysctlSettings:
|
||||||
default: {}
|
default: {}
|
||||||
description: Hash of extra sysctl settings to apply.
|
description: Hash of extra sysctl settings to apply.
|
||||||
type: json
|
type: json
|
||||||
|
tags:
|
||||||
|
- role_specific
|
||||||
|
|
||||||
|
resources:
|
||||||
|
# Merging role-specific parameters (RoleParameters) with the default parameters.
|
||||||
|
# RoleParameters will have the precedence over the default parameters.
|
||||||
|
RoleParametersValue:
|
||||||
|
type: OS::Heat::Value
|
||||||
|
properties:
|
||||||
|
type: json
|
||||||
|
value:
|
||||||
|
map_replace:
|
||||||
|
- map_replace:
|
||||||
|
- extra_kernel_modules: ExtraKernelModules
|
||||||
|
extra_sysctl_settings: ExtraSysctlSettings
|
||||||
|
- values: {get_param: [RoleParameters]}
|
||||||
|
- values:
|
||||||
|
ExtraKernelModules: {get_param: ExtraKernelModules}
|
||||||
|
ExtraSysctlSettings: {get_param: ExtraSysctlSettings}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
@ -88,7 +108,7 @@ outputs:
|
|||||||
map_merge:
|
map_merge:
|
||||||
- nf_conntrack: {}
|
- nf_conntrack: {}
|
||||||
nf_conntrack_proto_sctp: {}
|
nf_conntrack_proto_sctp: {}
|
||||||
- {get_param: ExtraKernelModules}
|
- {get_attr: [RoleParametersValue, value, extra_kernel_modules]}
|
||||||
sysctl_settings:
|
sysctl_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- net.ipv4.tcp_keepalive_intvl:
|
- net.ipv4.tcp_keepalive_intvl:
|
||||||
@ -155,7 +175,7 @@ outputs:
|
|||||||
# 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: InotifyIntancesMax}
|
||||||
- {get_param: ExtraSysctlSettings}
|
- {get_attr: [RoleParametersValue, value, extra_sysctl_settings]}
|
||||||
|
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::kernel
|
include ::tripleo::profile::base::kernel
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Allow to configure extra Kernel modules and extra sysctl settings per role
|
||||||
|
and not only global to the whole deployment.
|
||||||
|
The two parameters that can be role-specific are ExtraKernelModules and
|
||||||
|
ExtraSysctlSettings.
|
Loading…
Reference in New Issue
Block a user