X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e947590c6a42789d8a1c240331d85ca637274ed4..0ea36e10faf967f6b51a3b4025371b4607edc6b4:/roles/fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index c526226a8..8050e44a3 100644
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -2,45 +2,36 @@ name "fafnir"
 description "Master role applied to fafnir"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "36g"
-  },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.64.2",
+        :bond => {
+          :slaves => %w[eno1 eno2]
+        }
+      },
       :external_ipv4 => {
-        :interface => "enp3s0f0",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "130.239.18.114",
-        :prefix => "27",
-        :gateway => "130.239.18.97"
+        :address => "184.104.226.98"
       },
       :external_ipv6 => {
-        :interface => "enp3s0f0",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2001:6b0:e:2a18::114",
-        :prefix => "64",
-        :gateway => "fe80::5a97:bdff:fe79:dbc0"
+        :address => "2001:470:1:b3b::2"
       }
     }
-  },
-  :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 => "sweden.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[umu]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[gateway]",
+  "role[web-storage]"
 )