Don't redirect 127.0.0.1 as doing so can break munin

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 362ddb12f52e1a54c8b00b3fbc1049071d99b8b0..3d259f6743b14594b60e9ef684c89588bd8711eb 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",


@@ -55,24 +58,30 @@ default_attributes(
       },
       :load => {
         :load => {
       },
       :load => {
         :load => {

-          :warning => 250,
-          :critical => 300
+          :warning => 400,
+          :critical => 500

         }
       }
     }
   },
   :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.5"],

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


@@ -88,18 +97,11 @@ default_attributes(
         "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
         "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 => {
     }
   },
   :tile => {
     :database => {

-      :cluster => "9.4/main"
+      :cluster => "9.5/main"

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


@@ -114,7 +116,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

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

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