Configure stormfly-03 and stormfly-04 as tile caches

diff --git a/roles/stormfly-03.rb b/roles/stormfly-03.rb
index 5b300590ac54c7fbd2679b29c9f569847d5e7c3a..75359b155685f3a2f194c8422220f004c2d40260 100644 (file)
--- a/roles/stormfly-03.rb
+++ b/roles/stormfly-03.rb
@@ -2,6 +2,9 @@ name "stormfly-03"
 description "Master role applied to stormfly-03"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "38g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -17,10 +20,31 @@ default_attributes(
         :address => "2605:bc80:3010:700::8cd3:a763"
       }
     }
+  },
+  :squid => {
+    :version => 4,
+    :cache_mem => "32768 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"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "65536M"
+      }
+    }
+  },
+  :tilecache => {
+    :tile_parent => "corvallis.render.openstreetmap.org"
   }
 )
 
 run_list(
   "role[osuosl]",
-  "role[hp-g9]"
+  "role[hp-g9]",
+  "role[tilecache]"
 )

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index 941b67d893bbad1c39641835b415782bcf557586..f280803b9b7e468a094c3dfa4ffc1ce08b98533c 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -2,6 +2,9 @@ name "stormfly-04"
 description "Master role applied to stormfly-04"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "38g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -17,10 +20,31 @@ default_attributes(
         :address => "2605:bc80:3010:700::8cd3:a764"
       }
     }
+  },
+  :squid => {
+    :version => 4,
+    :cache_mem => "32768 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"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "65536M"
+      }
+    }
+  },
+  :tilecache => {
+    :tile_parent => "corvallis.render.openstreetmap.org"
   }
 )
 
 run_list(
   "role[osuosl]",
-  "role[hp-g9]"
+  "role[hp-g9]",
+  "role[tilecache]"
 )