imagery: add locatejs image assets

[chef.git] / roles / takhisis.rb

diff --git a/roles/takhisis.rb b/roles/takhisis.rb
index 9da7d3d0089b3df43da19e6cab34626beab9e6e3..40dbe5b355bb7f286063ca24b9003e305e1a4881 100644 (file)
--- a/roles/takhisis.rb
+++ b/roles/takhisis.rb
@@ -2,9 +2,6 @@ name "takhisis"
 description "Master role applied to takhisis"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "14g"
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -24,30 +21,9 @@ default_attributes(
         :gateway => "fe80::225:90ff:fe5d:c1e1"
       }
     }
-  },
-  :squid => {
-    :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"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "131072M"
-      }
-    }
-  },
-  :tilecache => {
-    :tile_parent => "ede.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[tuxis]",
-  "role[tilecache]"
+  "role[tuxis]"
 )