Merge remote-tracking branch 'github/pull/565'

[chef.git] / roles / necrosan.rb

diff --git a/roles/necrosan.rb b/roles/necrosan.rb
index cd5abd1193c5c270e0c1e6cdc5688a188ca78e24..3112464698a57d4c42675f30f5cfd64983b13789 100644 (file)
--- a/roles/necrosan.rb
+++ b/roles/necrosan.rb
@@ -28,41 +28,17 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
+  :sysfs => {
+    :hdd_tune => {
+      :comment => "Tune the queue for improved performance",

       :parameters => {
       :parameters => {

-        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
-      }
-    }
-  },
-  :tile => {
-    :database => {
-      :cluster => "14/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
-        ]
+        "block/sda/queue/nr_requests" => "975",
+        "block/sdb/queue/rotational" => "0"

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[appliwave]",
-  "role[tile]"
+  "role[appliwave]"

 )
 )