Disable sysctl tuning on openvz systems

[chef.git] / roles / imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index ba300985290829f01ef2a674c8ac09d72f22e44e..898e0dcdf405ccda8f51d9444029ff90eb451004 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -4,15 +4,17 @@ description "Role applied to all imagery servers"
 default_attributes(
   :accounts => {
     :users => {
 default_attributes(
   :accounts => {
     :users => {

+      :dmlu => { :status => :user },

       :htonl => { :status => :user },
       :htonl => { :status => :user },

+      :stereo => { :status => :user },

       :imagery => {
         :status => :role,
       :imagery => {
         :status => :role,

-        :members => [:grant, :tomh, :htonl]
+        :members => [:grant, :tomh, :dmlu, :htonl, :stereo ]

       }
     }
   },
   :apt => {
       }
     }
   },
   :apt => {

-    :sources => ["nginx"]
+    :sources => %w[ubuntugis-unstable]

   },
   :sysctl => {
     :sockets => {
   },
   :sysctl => {
     :sockets => {


@@ -27,6 +29,12 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }

+    },
+    :kernel_tfo_listen_enable => {
+      :comment => "Enable TCP Fast Open for listening sockets",
+      :parameters => {
+        "net.ipv4.tcp_fastopen" => 3
+      }

     }
   },
   :nginx => {
     }
   },
   :nginx => {


@@ -43,7 +51,13 @@ default_attributes(
 
 run_list(
   "recipe[imagery::au_agri]",
 
 run_list(
   "recipe[imagery::au_agri]",

+  "recipe[imagery::gb_ea]",

   "recipe[imagery::gb_hampshire_aerial]",
   "recipe[imagery::gb_os_sv]",
   "recipe[imagery::gb_hampshire_aerial]",
   "recipe[imagery::gb_os_sv]",

-  "recipe[imagery::gb_surrey_aerial]"
+  "recipe[imagery::gb_surrey_aerial]",
+  "recipe[imagery::za_ngi_topo]",
+  "recipe[imagery::za_coct_aerial]",
+  "recipe[imagery::na_sgswa_topo]",
+  "recipe[imagery::lu_ngl_dtm]",
+  "recipe[imagery::lu_lidar_hillshade]"

 )
 )