X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fccb66498e9111626aa4cc21d4e5ac0d5b161bc1..f9e3e2a61aca2a356d5e3f69b3f3f6f3c6986ce9:/roles/karm.rb

diff --git a/roles/karm.rb b/roles/karm.rb
index 897b10d80..ffad6d2ee 100644
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -2,20 +2,16 @@ name "karm"
 description "Master role applied to karm"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :db => {
-    :cluster => "9.1/main"
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "enp1s0f0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.168",
-        :hwaddress => "0c:c4:7a:a3:aa:ac"
+        :address => "10.0.48.50",
+        :bond => {
+          :slaves => %w[enp1s0f0 enp1s0f1 enp2s0f0 enp2s0f1]
+        }
       }
     }
   },
@@ -25,7 +21,9 @@ default_attributes(
         :shared_buffers => "64GB",
         :work_mem => "64MB",
         :maintenance_work_mem => "1GB",
-        :effective_cache_size => "180GB"
+        :effective_cache_size => "180GB",
+        :effective_io_concurrency => "256",
+        :random_page_cost => "1.1"
       }
     }
   },
@@ -37,23 +35,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"
-      }
-    }
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[db-master]"
+  "role[equinix-ams]",
+  "role[db-slave]"
 )