X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..21187d302463ac14ce12ea0b42d27d277d2f175a:/roles/katla.rb?ds=sidebyside

diff --git a/roles/katla.rb b/roles/katla.rb
index ece28c522..1e471b040 100644
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,19 +2,89 @@ name "katla"
 description "Master role applied to katla"
 
 default_attributes(
+  :apt => {
+    :sources => ["postgresql"]
+  },
+  :db => {
+    :cluster => "9.5/main"
+  },
+  :devices => {
+    :store_slow => {
+      :comment => "RAID array mounted on /store/arrays/slow",
+      :type => "block",
+      :bus => "scsi",
+      :serial => "3600605b005a0609019290f178be8de77",
+      :attrs => {
+        "queue/scheduler" => "deadline",
+        "queue/nr_requests" => "975",
+        "queue/rq_affinity" => "2"
+      }
+    },
+    :store_fast => {
+      :comment => "RAID array mounted on /store/arrays/fast",
+      :type => "block",
+      :bus => "scsi",
+      :serial => "3600605b005a0726019d062ae23b426fd",
+      :attrs => {
+        "queue/scheduler" => "deadline",
+        "queue/nr_requests" => "975",
+        "queue/rq_affinity" => "2"
+      }
+    },
+    :store_ssd_1 => {
+      :comment => "First disk of RAID array mounted on /store/arrays/ssd",
+      :type => "block",
+      :bus => "ata",
+      :serial => "INTEL_SSDSC2BA400G3_BTTV3141041E400HGN",
+      :attrs => {
+        "queue/scheduler" => "noop"
+      }
+    },
+    :store_ssd_2 => {
+      :comment => "Second disk of RAID array mounted on /store/arrays/ssd",
+      :type => "block",
+      :bus => "ata",
+      :serial => "INTEL_SSDSC2BA400G3_BTTV3141044Q400HGN",
+      :attrs => {
+        "queue/scheduler" => "noop"
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.173",
-        :hwaddress => "00:25:90:94:91:00"
+        :address => "10.0.32.40",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
+      }
+    }
+  },
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :shared_buffers => "64GB",
+        :work_mem => "64MB",
+        :maintenance_work_mem => "1GB",
+        :effective_cache_size => "180GB"
+      }
+    }
+  },
+  :sysctl => {
+    :postgres => {
+      :comment => "Increase shared memory for postgres",
+      :parameters => {
+        "kernel.shmmax" => 66 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
       }
     }
   }
-);
+)
 
 run_list(
-  "role[ic]"
+  "role[bytemark]",
+  "role[db-slave]"
 )