Upate poldi role for Ubuntu 14.04

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 01172686e451cdcbbef179089b6e7a337c15c797..57fe00e521a99a5889075e5433a4abec6a69825b 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -2,9 +2,6 @@ name "poldi"
 description "Master role applied to poldi"
 
 default_attributes(
-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },
   :devices => {
     :areca_ld_tune => {
       :comment => "RAID arrays on areca",
@@ -54,7 +51,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => [ "9.3" ],
     :settings => {
       :defaults => {
         :shared_buffers => "24GB",
@@ -66,10 +63,11 @@ default_attributes(
     }
   },
   :nominatim => {
+    :enabled => false,
     :database => {
-        :cluster => "9.1/main",
+        :cluster => "9.3/main",
         :dbname => "nominatim",
-        :postgis => "2.0"
+        :postgis => "2.1"
     },
     :fpm_pools => {
         :www => {
@@ -81,22 +79,11 @@ default_attributes(
             :max_children => "10"
         }
     }
-  },
-  :munin => {
-    :plugins => {
-      :sensors_volt => {
-        :volt6 => {
-          :warning => "2.992:3.536"
-        },
-        :volt10 => {
-          :warning => "2.71:3.29"
-        }
-      }
-    }
   }
 )
 
 run_list(
   "role[ucl-wolfson]",
+  "role[tyan-s7010]",
   "role[nominatim]"
 )