Convert postgresql_munin to an LWRP

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 7bb870f71e0848a0a5a36aaebd12177134707572..0f5b6c8b1a07d2896e8a4032499b79335152dd15 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -2,9 +2,6 @@ name "poldi"
 description "Master role applied to poldi"
 
 default_attributes(
 description "Master role applied to poldi"
 
 default_attributes(

-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },

   :devices => {
     :areca_ld_tune => {
       :comment => "RAID arrays on areca",
   :devices => {
     :areca_ld_tune => {
       :comment => "RAID arrays on areca",


@@ -32,7 +29,7 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
     :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"
       }
     }
         "block/md0/md/sync_speed_max" => "100000"
       }
     }


@@ -49,54 +46,60 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
         :interface => "eth1",
         :role => :external,
         :family => :inet,

-        :address => "128.40.168.106"
+        :address => "128.40.45.203"

       }
     }
   },
   :postgresql => {
       }
     }
   },
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["9.3"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :shared_buffers => "24GB",
+        :shared_buffers => "10GB",

         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",

-        :effective_cache_size => "48GB"
+        :effective_cache_size => "48GB",
+        :fsync => "on"

       }
     }
   },
   :nominatim => {
       }
     }
   },
   :nominatim => {

+    :enabled => false,
+    :flatnode_file => "/ssd-old/nominatim/nodes.store",

     :database => {
     :database => {

-        :cluster => "9.1/main",
-        :dbname => "nominatim",
-        :postgis => "2.0"
+      :cluster => "9.3/main",
+      :dbname => "nominatim",
+      :postgis => "2.1"

     },
     :fpm_pools => {
     },
     :fpm_pools => {

-        :www => {
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "10"
-        }
-    }
-  },
-  :munin => {
-    :plugins => {
-      :sensors_volt => {
-        :volt6 => {
-          :warning => "2.992:3.536"
-        },
-        :volt10 => {
-          :warning => "2.71:3.29"
-        }
+      :www => {
+        :port => "8000",
+        :pm => "dynamic",
+        :max_children => "60"
+      },
+      :bulk => {
+        :port => "8001",
+        :pm => "static",
+        :max_children => "10"

       }
       }

+    },
+    :tablespaces => {
+      "Osm2pgsql_Data" => "aux",
+      "Osm2pgsql_Index" => "data",
+      "Place_Data" => "ssd2",
+      "Place_Index" => "ssd1",
+      "Address_Data" => "ssd2",
+      "Address_Index" => "ssd1",
+      "Search_Data" => "ssd1",
+      "Search_Index" => "ssd1",
+      "Aux_Data" => "aux",
+      "Aux_Index" => "aux"

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
+  "role[tyan-s7010]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )