Add VLAN numbers to internal interfaces of UCL machines

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index b3c296dbc10c8472edd8daa815db0758b623ba0d..8a3f1dd369af16c1f38eb457ddb323b84c57b33b 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -58,24 +58,30 @@ default_attributes(
       },
       :load => {
         :load => {
-          :warning => 250,
-          :critical => 300
+          :warning => 400,
+          :critical => 500
         }
       }
     }
   },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "eth1.2801",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.0.15"
+      },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.208"
+        :address => "193.60.236.22"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.4"],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -91,18 +97,11 @@ 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 => "9.5/main"
     },
     :node_file => "/store/database/nodes",
     :styles => {
@@ -117,7 +116,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[tyan-s7010]",
   "role[tile]"
 )