split configuration in two, include new templates

[chef.git] / roles / ladon.rb

diff --git a/roles/ladon.rb b/roles/ladon.rb
index 68cd92325496587a23edfd68eca162d039d44502..c777bc6700221da7a7e6d5de784bee97628ca70a 100644 (file)
--- a/roles/ladon.rb
+++ b/roles/ladon.rb
@@ -2,6 +2,9 @@ name "ladon"
 description "Master role applied to ladon"
 
 default_attributes(
 description "Master role applied to ladon"
 
 default_attributes(

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

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -14,8 +17,8 @@ default_attributes(
         :bond => {
           :mode => "802.3ad",
           :miimon => "100",
         :bond => {
           :mode => "802.3ad",
           :miimon => "100",

-          :xmithashpolixt => "layer3+4",
-          :slaves => %w(eth0 eth1)
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[ens1f0 ens1f1]

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


@@ -27,9 +30,23 @@ default_attributes(
         :gateway => "2001:648:2ffe:4::1"
       }
     }
         :gateway => "2001:648:2ffe:4::1"
       }
     }

+  },
+  :squid => {
+    :version => 4,
+    :cache_mem => "32768 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
+  },
+  :tilecache => {
+    :tile_parent => "athens.render.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[grnet]"
+  "role[grnet]",
+  "role[tilecache]"

 )
 )