Remove site specific SSL config

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 6a92cfc90818836f9b5b9f755533fabe1b470bbc..94b2ea6839eff77b1714f41ad9f196029233682c 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -2,32 +2,29 @@ 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 => {
   :devices => {

-    :ubuntu => {
-      :comment => "RAID array backing the ubuntu volume group",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "20004d927fffff800",
-      :attrs => {
-        "queue/scheduler" => "deadline"
-      }
-    },
-    :nominatim => {
-      :comment => "RAID array backing the nominatim volume group",
+    :areca_ld_tune => {
+      :comment => "RAID arrays on areca",

       :type => "block",
       :bus => "scsi",
       :type => "block",
       :bus => "scsi",

-      :serial => "20004d927fffff801",
+      :serial => "20004d927fffff*",

       :attrs => {
       :attrs => {

-        "queue/scheduler" => "deadline"
+        "queue/scheduler" => "deadline",
+        "queue/read_ahead_kb" => "2048"

       }
     },
       }
     },

-    :nominatim2 => {
-      :comment => "RAID array backing the nominatim2 volume group",
+    :ssd_samsung_tune => {
+      :comment => "Tune Samsung SSD",

       :type => "block",
       :type => "block",

-      :bus => "scsi",
-      :serial => "20004d927fffff802",
+      :bus => "ata",
+      :serial => "Samsung_SSD_840_PRO_Series_*",

       :attrs => {
       :attrs => {

-        "queue/scheduler" => "deadline"
+        "queue/scheduler" => "noop",
+        "queue/nr_requests" => "256",
+        "queue/read_ahead_kb" => "2048"

       }
     }
   },
       }
     }
   },


@@ -35,7 +32,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"
       }
     }


@@ -52,11 +49,12 @@ 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" ],

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


@@ -66,10 +64,29 @@ default_attributes(
         :effective_cache_size => "48GB"
       }
     }
         :effective_cache_size => "48GB"
       }
     }

+  },
+  :nominatim => {
+    :enabled => false,
+    :database => {
+        :cluster => "9.1/main",
+        :dbname => "nominatim",
+        :postgis => "2.0"
+    },
+    :fpm_pools => {
+        :www => {
+            :pm => "dynamic",
+            :max_children => "60"
+        },
+        :bulk => {
+            :pm => "static",
+            :max_children => "10"
+        }
+    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

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