imagery: increase timeout while overviews STILL generate

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index f290b23c454497ae5b14e210401082ccbff5e540..b49ffabd949cca73ccf39af81622698076de0ece 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,70 +51,52 @@ 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

         }
         }

-      },
-      :ipmi_fans => {
-        :contacts => "null",
-      },
-      :ipmi_temp => {
-        :contacts => "null",
-      },
-      :sensors_fan => {
-        :contacts => "null"
-      },
-      :sensors_temp => {
-        :contacts => "null"
-      },
-      :sensors_volt => {
-        :contacts => "null"

       }
     }
   },
   :networking => {
     :interfaces => {
       }
     }
   },
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.15"
-      },

       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,

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

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

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

     :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 => "9.4/main"
+    },

     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {


@@ -125,6 +110,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
+  "role[tyan-s7010]",

   "role[tile]"
 )
   "role[tile]"
 )