Merge remote-tracking branch 'github/pull/464'

[chef.git] / roles / saphira.rb

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

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

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


@@ -24,31 +21,10 @@ default_attributes(
         :gateway => "fe80::fcff:ffff:feff:ffff"
       }
     }
         :gateway => "fe80::fcff:ffff:feff:ffff"
       }
     }

-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "8192 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"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "4096M"
-      }
-    }
-  },
-  :tilecache => {
-    :tile_parent => "london.render.openstreetmap.org"

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

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

 )
 )