X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d825d2d30731d4d7870af46aaec3eb5e225f909c..2a9c33428c35514b1c6482482a42cd946865e480:/roles/karm.rb?ds=inline

diff --git a/roles/karm.rb b/roles/karm.rb
index 8f0ce7a23..ac28c48d4 100644
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -2,21 +2,19 @@ name "karm"
 description "Master role applied to karm"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :db => {
-    :cluster => "9.5/main"
-  },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.50",
+        :inet => {
+          :address => "10.0.48.50"
+        },
         :bond => {
-          :slaves => %w[enp1s0f0 enp1s0f1]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp1s0f0 enp1s0f1 enp2s0f0 enp2s0f1]
         }
       }
     }
@@ -27,9 +25,8 @@ default_attributes(
         :shared_buffers => "64GB",
         :work_mem => "64MB",
         :maintenance_work_mem => "1GB",
-        :effective_cache_size => "180GB",
-        :effective_io_concurrency => "256",
-        :random_page_cost => "1.1"
+        :effective_cache_size => "180GB"
+
       }
     }
   },
@@ -45,7 +42,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix]",
-  "role[db-master]",
-  "role[db-backup]"
+  "role[equinix-ams]",
+  "role[db-slave]"
 )