Don't try and tune nr_requests on jakelong

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 7141ed89d8659e8b2e4557255ae069559314fcbf..1c3a3a415eb5fba40444de4585f206f7b522d366 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -18,7 +18,7 @@ default_attributes(
         :family => :inet6,
         :address => "2001:470:1:41:a800:ff:fe3e:cdca",
         :prefix => "64",
         :family => :inet6,
         :address => "2001:470:1:41:a800:ff:fe3e:cdca",
         :prefix => "64",

-        :gateway => "fe80::21b:21ff:fead:e886"
+        :gateway => "fe80::260:ddff:fe46:623d"

       }
     }
   },
       }
     }
   },


@@ -39,7 +39,6 @@ default_attributes(
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
       :parameters => {
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
       :parameters => {

-        "block/xvda/queue/nr_requests" => "128",

         "block/xvda/queue/scheduler" => "deadline"
       }
     }
         "block/xvda/queue/scheduler" => "deadline"
       }
     }


@@ -49,13 +48,16 @@ default_attributes(
     :tile_siblings => [
       "nadder-01.openstreetmap.org",
       "nadder-02.openstreetmap.org",
     :tile_siblings => [
       "nadder-01.openstreetmap.org",
       "nadder-02.openstreetmap.org",

+      "stormfly-02.openstreetmap.org",

       "nepomuk.openstreetmap.org",
       "nepomuk.openstreetmap.org",

-      "tabaluga.openstreetmap.org"
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org"

     ]
   }
 )
 
 run_list(
   "role[prgmr]",
     ]
   }
 )
 
 run_list(
   "role[prgmr]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )