Merge remote-tracking branch 'github/pull/459'

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index e5086064dff592bd364ede0783657425017baf83..9cd93e053b7cbedcf23da576ff7686fdb41e0b81 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -2,8 +2,10 @@ name "ascalon"
 description "Master role applied to ascalon"
 
 default_attributes(
 description "Master role applied to ascalon"
 
 default_attributes(

+  :hardware => {
+    :shm_size => "20g"
+  },

   :networking => {
   :networking => {

-    :netplan => true,

     :interfaces => {
       :external_ipv4 => {
         :interface => "eno1",
     :interfaces => {
       :external_ipv4 => {
         :interface => "eno1",


@@ -16,20 +18,21 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

-    :cache_mem => "16000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]

   },
   :tilecache => {
   },
   :tilecache => {

-    :tile_parent => "montreal.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-02.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]
+    :tile_parent => "montreal.render.openstreetmap.org"

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

-  "role[geodns]",

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