X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/83c36650ea08176463547a91d8e7a563db7cba7b..7e52994e42d49a148ab9b1931d79e59f837af8a7:/roles/eddie.rb

diff --git a/roles/eddie.rb b/roles/eddie.rb
index eb6753f45..0dbe9dd0a 100644
--- a/roles/eddie.rb
+++ b/roles/eddie.rb
@@ -2,12 +2,6 @@ name "eddie"
 description "Master role applied to eddie"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :db => {
-    :cluster => "9.5/main"
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -25,7 +19,8 @@ default_attributes(
         :work_mem => "64MB",
         :maintenance_work_mem => "1GB",
         :effective_cache_size => "180GB",
-        :effective_io_concurrency => "256"
+        :effective_io_concurrency => "256",
+        :random_page_cost => "1.1"
       }
     }
   },
@@ -37,23 +32,10 @@ default_attributes(
         "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
       }
     }
-  },
-  :sysfs => {
-    :md_tune => {
-      :comment => "Enable request merging for NVMe devices",
-      :parameters => {
-        "block/nvme0n1/queue/nomerges" => "1",
-        "block/nvme1n1/queue/nomerges" => "1",
-        "block/nvme2n1/queue/nomerges" => "1",
-        "block/nvme3n1/queue/nomerges" => "1",
-        "block/nvme4n1/queue/nomerges" => "1",
-        "block/nvme5n1/queue/nomerges" => "1",
-        "block/nvme6n1/queue/nomerges" => "1"
-      }
-    }
   }
 )
 
 run_list(
-  "role[ucl]"
+  "role[ucl]",
+  "role[db-slave]"
 )