X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7bf9926d8fd2ba918eaa379aace7c7c02c500ace..74b8b23ce38fa7205877e32a7604e16eefeb1d6c:/roles/yevaud.rb?ds=sidebyside

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 7ff33d710..012077183 100644
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -2,6 +2,9 @@ name "yevaud"
 description "Master role applied to yevaud"
 
 default_attributes(
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :devices => {
     :osdisktune1 => {
       :comment => "Tune os disk",
@@ -48,71 +51,58 @@ default_attributes(
   :munin => {
     :plugins => {
       :cpu => {
-        :system => { 
+        :system => {
           :warning => 500,
           :critical => 600
         }
       },
       :load => {
-        :load => { 
-          :warning => 150,
-          :critical => 200
+        :load => {
+          :warning => 400,
+          :critical => 500
         }
-      },
-      :ipmi_fans => {
-        :contacts => "null",
-      },
-      :ipmi_temp => {
-        :CPU0belowTmax => { :critical => "10:" },
-        :CPU1belowTmax => { :critical => "10:" }
-      },
-      :sensors_fan => {
-        :contacts => "null"
-      },
-      :sensors_temp => {
-        :contacts => "null"
-      },
-      :sensors_volt => {
-        :contacts => "null"
       }
     }
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "eth0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.15"
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth0.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.208"
+        :address => "193.60.236.22"
       }
     }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
-        :shared_buffers => "3GB",
+        :shared_buffers => "8GB",
         :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "8GB"
+        :effective_cache_size => "16GB"
       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
-        "kernel.shmmax" => 4 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 4 * 1024 * 1024 * 1024 / 4096
+      :parameters => {
+        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }
   },
   :tile => {
+    :database => {
+      :cluster => "9.5/main"
+    },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
@@ -126,6 +116,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
+  "role[tyan-s7010]",
   "role[tile]"
 )