Merge interface families

[chef.git] / roles / firnen.rb

diff --git a/roles/firnen.rb b/roles/firnen.rb
index 4bd2aff98ee29f762475c39569a64462967f6073..9d8513f2e2193c39d8095dbd5373edfe94d7bc8a 100644 (file)
--- a/roles/firnen.rb
+++ b/roles/firnen.rb
@@ -2,37 +2,21 @@ name "firnen"
 description "Master role applied to firnen"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "36g"
-  },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "enp6s0",
         :role => :external,
-        :family => :inet,
-        :address => "188.241.28.82",
-        :prefix => "29",
-        :gateway => "188.241.28.81"
+        :inet => {
+          :address => "188.241.28.82",
+          :prefix => "29",
+          :gateway => "188.241.28.81"
+        }
       }
     }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "32768 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"
-    ]
-  },
-  :tilecache => {
-    :tile_parent => "germany.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[epix]",
-  "role[tilecache]"
+  "role[epix]"
 )