Make bond configuration more robust

[chef.git] / roles / karm.rb

diff --git a/roles/karm.rb b/roles/karm.rb
index a8f6b9e29eb94a1e38b55f06c55b4f1dfd33ea60..bb736d72cff3700376f53d98829a9d12c57c4c26 100644 (file)
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -2,18 +2,14 @@ name "karm"
 description "Master role applied to karm"
 
 default_attributes(
-  :db => {
-    :cluster => "9.5/main"
-  },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.50",
+      :internal => {
+        :inet => {
+          :address => "10.0.48.50"
+        },
         :bond => {
-          :slaves => %w[enp1s0f0 enp1s0f1]
+          :slaves => %w[enp1s0f0 enp1s0f1 enp2s0f0 enp2s0f1]
         }
       }
     }
@@ -24,9 +20,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"
+
       }
     }
   },
@@ -42,7 +37,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix]",
-  "role[db-master]",
-  "role[db-backup]"
+  "role[equinix-ams]",
+  "role[db-slave]"
 )