Merge "Use ::os_workers fact instead of ::processorcount"

[apex-tripleo-heat-templates.git] / puppet / services / kernel.yaml

diff --git a/puppet/services/kernel.yaml b/puppet/services/kernel.yaml
index 50ebe92..1fc88bf 100644 (file)
--- a/puppet/services/kernel.yaml
+++ b/puppet/services/kernel.yaml
@@ -4,6 +4,15 @@ description: >
   Load kernel modules with kmod and configure kernel options with sysctl.
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -30,8 +39,12 @@ outputs:
           net.netfilter.nf_conntrack_max:
             value: 500000
           # prevent neutron bridges from autoconfiguring ipv6 addresses
+          net.ipv6.conf.all.accept_ra:
+            value: 0
           net.ipv6.conf.default.accept_ra:
             value: 0
+          net.ipv6.conf.all.autoconf:
+            value: 0
           net.ipv6.conf.default.autoconf:
             value: 0
           net.core.netdev_max_backlog: