From 5e1b9194adc5cbbc86fbc2d58b345e88828b2b0f Mon Sep 17 00:00:00 2001
From: Nobuto Murata <nobuto@ubuntu.com>
Date: Mon, 16 Feb 2015 15:35:20 +0900
Subject: [PATCH 1/3] increase more sysctl values by default to allow 256k
 threads per process and 2M threads in total, LP: #1420339

---
 config.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/config.yaml b/config.yaml
index d087510..16c5d0c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -157,12 +157,13 @@ options:
       your network interface.
   sysctl:
     type: string
-    default: '{ kernel.pid_max : 2097152 }'
+    default: '{ kernel.pid_max : 2097152, vm.max_map_count : 524288, kernel.threads-max: 2097152 }'
     description: |
       YAML-formatted associative array of sysctl key/value pairs to be set
-      persistently. As a default we set pid_max to a high value to avoid
-      problems with large numbers (>20) of OSDs recovering. very large clusters
-      should set this value even higher (max 4194303).
+      persistently. As a default we set pid_max, max_map_count and 
+      threads-max to a high value to avoid problems with large numbers (>20)
+      of OSDs recovering. very large clusters should set pid_max even 
+      higher (max 4194303).
   nagios_context:
     default: "juju"
     description: |

From ada656e1d9e920a7f3fe66fd460c0a5f7a1ab3b9 Mon Sep 17 00:00:00 2001
From: Nobuto Murata <nobuto@ubuntu.com>
Date: Mon, 16 Feb 2015 18:42:32 +0900
Subject: [PATCH 2/3] update config.yaml description

---
 config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.yaml b/config.yaml
index 16c5d0c..22d3424 100644
--- a/config.yaml
+++ b/config.yaml
@@ -162,7 +162,7 @@ options:
       YAML-formatted associative array of sysctl key/value pairs to be set
       persistently. As a default we set pid_max, max_map_count and 
       threads-max to a high value to avoid problems with large numbers (>20)
-      of OSDs recovering. very large clusters should set pid_max even 
+      of OSDs recovering. very large clusters should set those values even
       higher (max 4194303).
   nagios_context:
     default: "juju"

From 9b2f1ecfc7825c3357aeb7293796bdb2af8e5da1 Mon Sep 17 00:00:00 2001
From: Nobuto Murata <nobuto@ubuntu.com>
Date: Wed, 18 Feb 2015 15:46:35 +0900
Subject: [PATCH 3/3] fix lint warning

---
 config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.yaml b/config.yaml
index 22d3424..6c5b74e 100644
--- a/config.yaml
+++ b/config.yaml
@@ -165,6 +165,7 @@ options:
       of OSDs recovering. very large clusters should set those values even
       higher (max 4194303).
   nagios_context:
+    type: string
     default: "juju"
     description: |
       Used by the nrpe-external-master subordinate charm.