From: Tom Hughes <tom@compton.nu>
Date: Tue, 12 Nov 2019 09:04:40 +0000 (+0000)
Subject: Increase shared memory limit on various caches
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ea29fb4b7d50ab732fdb5a1f5942254d09e538cb

Increase shared memory limit on various caches
---

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 454386459..ff02962db 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -538,7 +538,7 @@ end
 
 if node[:hardware][:shm_size]
   mount "/dev/shm" do
-    action [:mount, :enable]
+    action [:mount, :remount, :enable]
     device "tmpfs"
     fstype "tmpfs"
     options "rw,nosuid,nodev,size=#{node[:hardware][:shm_size]}"
diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index ea377fb5b..f20cf2ec8 100644
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -3,7 +3,7 @@ description "Master role applied to ascalon"
 
 default_attributes(
   :hardware => {
-    :shm_size => "18g"
+    :shm_size => "20g"
   },
   :networking => {
     :interfaces => {
diff --git a/roles/boitata.rb b/roles/boitata.rb
index 82cc3399e..7b095610f 100644
--- a/roles/boitata.rb
+++ b/roles/boitata.rb
@@ -3,7 +3,7 @@ description "Master role applied to boitata"
 
 default_attributes(
   :hardware => {
-    :shm_size => "12g"
+    :shm_size => "14g"
   },
   :networking => {
     :interfaces => {
diff --git a/roles/cherufe.rb b/roles/cherufe.rb
index 87f6da6f8..e10feab2b 100644
--- a/roles/cherufe.rb
+++ b/roles/cherufe.rb
@@ -3,7 +3,7 @@ description "Master role applied to cherufe"
 
 default_attributes(
   :hardware => {
-    :shm_size => "10g"
+    :shm_size => "12g"
   },
   :networking => {
     :interfaces => {
diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 1799f18dc..329669e5d 100644
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -3,7 +3,7 @@ description "Master role applied to gorynych"
 
 default_attributes(
   :hardware => {
-    :shm_size => "18g"
+    :shm_size => "20g"
   },
   :munin => {
     :plugins => {
diff --git a/roles/kalessin.rb b/roles/kalessin.rb
index 2ab415ca5..9176d2a2f 100644
--- a/roles/kalessin.rb
+++ b/roles/kalessin.rb
@@ -3,7 +3,7 @@ description "Master role applied to kalessin"
 
 default_attributes(
   :hardware => {
-    :shm_size => "18g"
+    :shm_size => "20g"
   },
   :networking => {
     :interfaces => {
diff --git a/roles/konqi.rb b/roles/konqi.rb
index 7cc2eb940..8b529781d 100644
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -3,7 +3,7 @@ description "Master role applied to konqi"
 
 default_attributes(
   :hardware => {
-    :shm_size => "18g"
+    :shm_size => "20g"
   },
   :networking => {
     :interfaces => {
diff --git a/roles/longma.rb b/roles/longma.rb
index e2a498c4c..8fed94393 100644
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :hardware => {
-    :shm_size => "18g"
+    :shm_size => "20g"
   },
   :networking => {
     :interfaces => {
diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 455173197..25f435735 100644
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -3,7 +3,7 @@ description "Master role applied to stormfly-02"
 
 default_attributes(
   :hardware => {
-    :shm_size => "36g"
+    :shm_size => "38g"
   },
   :networking => {
     :interfaces => {