Merge pull request #236 from Tigerfell/master

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 7dcace09d32510d3e71b7ca9f6b997866949af12..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(
 description "Master role applied to yevaud"
 
 default_attributes(

+  :apt => {
+    :sources => ["postgresql"]
+  },

   :devices => {
     :osdisktune1 => {
       :comment => "Tune os disk",
   :devices => {
     :osdisktune1 => {
       :comment => "Tune os disk",


@@ -48,61 +51,72 @@ default_attributes(
   :munin => {
     :plugins => {
       :cpu => {
   :munin => {
     :plugins => {
       :cpu => {

-        :system => { 
+        :system => {

           :warning => 500,
           :critical => 600
         }
       },
       :load => {
           :warning => 500,
           :critical => 600
         }
       },
       :load => {

-        :load => { 
-          :warning => 150,
-          :critical => 200
+        :load => {
+          :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 => {
       }
     }
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "eth0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.15"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.15"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth0.2800",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "128.40.45.208"
+        :address => "193.60.236.22"

       }
     }
   },
   :postgresql => {
       }
     }
   },
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["10"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :shared_buffers => "3GB",
+        :shared_buffers => "8GB",

         :maintenance_work_mem => "7144MB",
         :maintenance_work_mem => "7144MB",

-        :effective_cache_size => "8GB"
+        :effective_cache_size => "16GB"

       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
       }
     }
   },
   :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 => {
       }
     }
   },
   :tile => {

+    :database => {
+      :cluster => "10/main",
+      :postgis => "2.4"
+    },

     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [
     :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 }

         ]
       }
     }
         ]
       }
     }


@@ -110,7 +124,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-wolfson]",
+  "role[ucl]",

   "role[tyan-s7010]",
   "role[tile]"
 )
   "role[tyan-s7010]",
   "role[tile]"
 )