Tweak tile cache configuration for squid 4

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 362ddb12f52e1a54c8b00b3fbc1049071d99b8b0..37b6995c4e8e1548dc1f3c3b0ffa54daa1f6e639 100644 (file)
--- 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",
@@ -55,24 +58,38 @@ default_attributes(
       },
       :load => {
         :load => {
-          :warning => 250,
-          :critical => 300
+          :warning => 400,
+          :critical => 500
         }
+      },
+      :sensors_temp => {
+        :temp1 => { :warning => 82 },
+        :temp2 => { :warning => 82 },
+        :temp3 => { :warning => 82 },
+        :temp4 => { :warning => 82 },
+        :temp5 => { :warning => 82 },
+        :temp6 => { :warning => 82 }
       }
     }
   },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :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.4"],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -88,25 +105,18 @@ default_attributes(
         "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
-    },
-    :cpu_tune => {
-      :comment => "Tune kern sched migration cost",
-      :parameters => {
-        "kernel.sched_autogroup_enabled" => 0,
-        "kernel.sched_migration_cost_ns" => 25000000
-      }
     }
   },
   :tile => {
     :database => {
-      :cluster => "9.4/main"
+      :cluster => "10/main",
+      :postgis => "2.4"
     },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [
-          { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 16 },
-          { :name => "/store/tiles/default-high", :min_zoom => 17, :max_zoom => 19 }
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
       }
     }
@@ -114,7 +124,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl]",
   "role[tyan-s7010]",
   "role[tile]"
 )