Upate poldi role for Ubuntu 14.04

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index f340d82e081ae382579c396a4903a3a675048d80..57fe00e521a99a5889075e5433a4abec6a69825b 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -29,7 +29,7 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
-        "block/md0/md/sync_speed_min" => "100",
+        "block/md0/md/sync_speed_min" => "1",
         "block/md0/md/sync_speed_max" => "100000"
       }
     }
@@ -46,11 +46,12 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.106"
+        :address => "128.40.45.203"
       }
     }
   },
   :postgresql => {
+    :versions => [ "9.3" ],
     :settings => {
       :defaults => {
         :shared_buffers => "24GB",
@@ -62,29 +63,27 @@ default_attributes(
     }
   },
   :nominatim => {
+    :enabled => false,
+    :database => {
+        :cluster => "9.3/main",
+        :dbname => "nominatim",
+        :postgis => "2.1"
+    },
     :fpm_pools => {
         :www => {
             :pm => "dynamic",
-            :max_children => "80"
+            :max_children => "60"
         },
         :bulk => {
             :pm => "static",
             :max_children => "10"
         }
     }
-  },
-  :munin => {
-    :plugins => {
-      :sensors_volt => {
-        :volt6 => {
-          :warning => "2.992:3.536"
-        }
-      }
-    }
   }
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
+  "role[tyan-s7010]",
   "role[nominatim]"
 )