geodns: enable include_optional_ns to please picky DNS servers

[chef.git] / roles / tuatara.rb

diff --git a/roles/tuatara.rb b/roles/tuatara.rb
index afad1ab8286642c776af2b091b97855a9c1f3d57..6e908fec72ff3a98d3c789ebdd41ec50b0935bc0 100644 (file)
--- a/roles/tuatara.rb
+++ b/roles/tuatara.rb
@@ -2,31 +2,41 @@ name "tuatara"
 description "Master role applied to tuatara"
 
 default_attributes(
 description "Master role applied to tuatara"
 
 default_attributes(

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

   :networking => {
   :networking => {

-    :netplan => true,

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

-        :address => "103.106.66.202",
-        :prefix => "24",
-        :gateway => "103.106.66.254"
+        :address => "114.23.141.203",
+        :prefix => "29",
+        :gateway => "114.23.141.201"
+      },
+      :external_ipv6 => {
+        :interface => "eno1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2406:1e00:b410:c24:529a:4cff:fe79:bc3b",
+        :prefix => "64",
+        :gateway => "2406:1e00:b410:c24::"

       }
     }
   },
   :squid => {
       }
     }
   },
   :squid => {

-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "10240 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 => "wellington.render.openstreetmap.org",
-    :tile_siblings => [
-      "waima.openstreetmap.org",
-      "longma.openstreetmap.org",
-      "storfly-02.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]
+    :tile_parent => "wellington.render.openstreetmap.org"

   }
 )
 
   }
 )