Update odin configuration for squid 3

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index d19360027c388f093eb06229f443c54b01c23ef2..1968df0945793a2ca3280ba4a372e8e7e9a9797e 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -5,15 +5,22 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eno1",
+        :interface => "bond0",

         :role => :external,
         :family => :inet,
         :address => "130.225.254.123",
         :prefix => "23",
         :role => :external,
         :family => :inet,
         :address => "130.225.254.123",
         :prefix => "23",

-        :gateway => "130.225.254.97"
+        :gateway => "130.225.254.97",
+        :bond => {
+          :mode => "802.3ad",
+          :miimon => "100",
+          :xmithashpolicy => "layer3+4",
+          :lacprate => "fast",
+          :slaves => %w[eno1 eno2]
+        }

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "eno1",
+        :interface => "bond0",

         :role => :external,
         :family => :inet6,
         :address => "2001:878:346::123",
         :role => :external,
         :family => :inet6,
         :address => "2001:878:346::123",


@@ -23,8 +30,9 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

+    :version => "3",

     :cache_mem => "14000 MB",
     :cache_mem => "14000 MB",

-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :cache_dir => "rock /store/squid/rock-01 128000 slot-size=4096 max-size=262144"

   },
   :tilecache => {
     :tile_parent => "aalborg.render.openstreetmap.org",
   },
   :tilecache => {
     :tile_parent => "aalborg.render.openstreetmap.org",