Add all interfaces to bond on faffy

[chef.git] / roles / angor.rb

diff --git a/roles/angor.rb b/roles/angor.rb
index e29127eed6f2d86646758201960eedfade80f86c..7dcef6843f114f293135c4a671517da6d92f4f3f 100644 (file)
--- a/roles/angor.rb
+++ b/roles/angor.rb
@@ -2,9 +2,6 @@ name "angor"
 description "Master role applied to angor"
 
 default_attributes(
 description "Master role applied to angor"
 
 default_attributes(

-  :hardware => {
-    :shm_size => "18g"
-  },

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


@@ -24,30 +21,10 @@ default_attributes(
         :gateway => "2001:43f8:1f4:b00::1"
       }
     }
         :gateway => "2001:43f8:1f4:b00::1"
       }
     }

-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "16384 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 => "capetown.render.openstreetmap.org",
-    :tile_siblings => [
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   "role[inxza]",
   }
 )
 
 run_list(
   "role[inxza]",

-  "role[tilecache]",

   "role[ftp]"
 )
   "role[ftp]"
 )