Fix composite PDU graphs

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 0dc9b0d75fd6426452fde5dde4647fe3242df9ba..f9408a69aec38ea10ba6db166df2c16e8a0e487f 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -58,24 +58,38 @@ default_attributes(
       },
       :load => {
         :load => {
       },
       :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 => {
       }
     }
   },
   :networking => {
     :interfaces => {

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

       :external_ipv4 => {
       :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.4"],
+    :versions => ["9.6"],

     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",


@@ -95,7 +109,8 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "9.4/main"
+      :cluster => "9.6/main",
+      :postgis => "2.3"

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


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

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

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