Upgrade bytemark machines to chef 13

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

diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 5bcbc533f8a63f5d76431e34a0ccab544748666a..76c62732a6dff300737a841e6d55a0c9b911280e 100644 (file)
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -5,15 +5,38 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "em1",
         :role => :external,
         :family => :inet,
         :address => "140.211.167.105"
+      },
+      :external_ipv6 => {
+        :interface => "em1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2605:bc80:3010:700::8cde:a769"
       }
     }
+  },
+  :squid => {
+    :cache_mem => "21000 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "corvallis.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-01.openstreetmap.org",
+      "nadder-02.openstreetmap.org",
+      "jakelong.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "lurien.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[osuosl]"
+  "role[osuosl]",
+  "role[hp-dl360-g6]",
+  "role[geodns]",
+  "role[tilecache]"
 )