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

[chef.git] / roles / meraxes.rb

diff --git a/roles/meraxes.rb b/roles/meraxes.rb
index 7729a17df1309c5897d8b792d5da7dc37c4e3976..6123444078d303e71a2c20e51a33b9de3071b7e3 100644 (file)
--- a/roles/meraxes.rb
+++ b/roles/meraxes.rb
@@ -2,13 +2,7 @@ name "meraxes"
 description "Master role applied to meraxes"
 
 default_attributes(
 description "Master role applied to meraxes"
 
 default_attributes(

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

   :networking => {
   :networking => {

-    :firewall => {
-      :enabled => true
-    },

     :interfaces => {
       :external_ipv4 => {
         :interface => "enp1s0f0",
     :interfaces => {
       :external_ipv4 => {
         :interface => "enp1s0f0",


@@ -27,23 +21,9 @@ default_attributes(
         :gateway => "2001:bc8:2::2:258:1"
       }
     }
         :gateway => "2001:bc8:2::2:258: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 => "france.render.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

 )
 )