Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / stormfly-01.rb

diff --git a/roles/stormfly-01.rb b/roles/stormfly-01.rb
index 904ed8138607a717381c229b0ecebde4aa79d2b8..bbd90d35e42947d1498782ee571ffc0f4a5eca45 100644 (file)
--- a/roles/stormfly-01.rb
+++ b/roles/stormfly-01.rb
@@ -2,15 +2,16 @@ name "stormfly-01"
 description "Master role applied to stormfly-01"
 
 default_attributes(
 description "Master role applied to stormfly-01"
 
 default_attributes(

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

   :networking => {
     :interfaces => {
       :external_ipv4 => {
         :interface => "em1",
         :role => :external,
         :family => :inet,
   :networking => {
     :interfaces => {
       :external_ipv4 => {
         :interface => "em1",
         :role => :external,
         :family => :inet,

-        :address => "140.211.167.104",
-        :prefix => "28",
-        :gateway => "140.211.167.97"
+        :address => "140.211.167.104"

       },
       :external_ipv6 => {
         :interface => "em1",
       },
       :external_ipv6 => {
         :interface => "em1",


@@ -19,11 +20,31 @@ default_attributes(
         :address => "2605:bc80:3010:700::8cde:a768"
       }
     }
         :address => "2605:bc80:3010:700::8cde:a768"
       }
     }

+  },
+  :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-dl360-g6]",
   }
 )
 
 run_list(
   "role[osuosl]",
   "role[hp-dl360-g6]",

-  "role[taginfo]"
+  "role[tilecache]"

 )
 )