Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Disable ComputeNeutron* for cisco-nexus-ucsm"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
kernel.yaml
diff --git
a/puppet/services/kernel.yaml
b/puppet/services/kernel.yaml
index
9b314b2
..
697ec22
100644
(file)
--- a/
puppet/services/kernel.yaml
+++ b/
puppet/services/kernel.yaml
@@
-13,6
+13,14
@@
parameters:
DefaultPasswords:
default: {}
type: json
DefaultPasswords:
default: {}
type: json
+ RoleName:
+ default: ''
+ description: Role name on which the service is applied
+ type: string
+ RoleParameters:
+ default: {}
+ description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-22,6
+30,10
@@
parameters:
default: 1048576
description: Configures sysctl kernel.pid_max key
type: number
default: 1048576
description: Configures sysctl kernel.pid_max key
type: number
+ KernelDisableIPv6:
+ default: 0
+ description: Configures sysctl net.ipv6.{default/all}.disable_ipv6 keys
+ type: number
outputs:
role_data:
outputs:
role_data:
@@
-31,7
+43,7
@@
outputs:
config_settings:
kernel_modules:
nf_conntrack: {}
config_settings:
kernel_modules:
nf_conntrack: {}
-
ip
_conntrack_proto_sctp: {}
+
nf
_conntrack_proto_sctp: {}
sysctl_settings:
net.ipv4.tcp_keepalive_intvl:
value: 1
sysctl_settings:
net.ipv4.tcp_keepalive_intvl:
value: 1
@@
-57,6
+69,10
@@
outputs:
value: 500000
net.netfilter.nf_conntrack_max:
value: 500000
value: 500000
net.netfilter.nf_conntrack_max:
value: 500000
+ net.ipv6.conf.default.disable_ipv6:
+ value: {get_param: KernelDisableIPv6}
+ net.ipv6.conf.all.disable_ipv6:
+ value: {get_param: KernelDisableIPv6}
# prevent neutron bridges from autoconfiguring ipv6 addresses
net.ipv6.conf.all.accept_ra:
value: 0
# prevent neutron bridges from autoconfiguring ipv6 addresses
net.ipv6.conf.all.accept_ra:
value: 0