Merge pull request #236 from Tigerfell/master

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

diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 7d5a38bf78f96daaf54f0c01345e418f9e34bd3e..865ba66a0caec5cb37ff363f35f71f31910af073 100644 (file)
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -9,18 +9,23 @@ default_attributes(
         :role => :external,
         :family => :inet,
         :address => "140.211.167.105"
         :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 => {
       }
     }
   },
   :squid => {

-    :cache_mem => "29000 MB",
+    :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 => [
     :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",
+      "ascalon.openstreetmap.org",

       "jakelong.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "lurien.openstreetmap.org"
       "jakelong.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "lurien.openstreetmap.org"


@@ -30,6 +35,7 @@ default_attributes(
 
 run_list(
   "role[osuosl]",
 
 run_list(
   "role[osuosl]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",
+  "role[geodns]",

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