Fix composite PDU graphs

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 30f58fc4a31a104790ddbc9a40fa9c020b26e112..f9408a69aec38ea10ba6db166df2c16e8a0e487f 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -61,19 +61,27 @@ default_attributes(
           :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",
+        :interface => "eth0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.15"
       },
       :external_ipv4 => {
-        :interface => "eth1.2800",
+        :interface => "eth0.2800",
         :role => :external,
         :family => :inet,
         :address => "193.60.236.22"
@@ -81,7 +89,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -101,7 +109,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.5/main"
+      :cluster => "9.6/main",
+      :postgis => "2.3"
     },
     :node_file => "/store/database/nodes",
     :styles => {
@@ -116,7 +125,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-slough]",
+  "role[ucl]",
   "role[tyan-s7010]",
   "role[tile]"
 )