X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2c3bb4b02302a37e1c14e045833feb71b5a3130d..efca28add0f066c7e0553181e2d5a02b717f310e:/roles/fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 297a610c3..76a6efc62 100644
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -4,40 +4,36 @@ description "Master role applied to fafnir"
 default_attributes(
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.64.2",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :slaves => %w[eno1 eno2]
+        }
+      },
       :external_ipv4 => {
-        :interface => "enp3s0f0",
+        :interface => "bond0.101",
         :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.101",
         :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 => {
-    :cache_mem => "28000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "sweden.render.openstreetmap.org",
-    :tile_siblings => [
-      "nidhogg.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "rimfaxe.openstreetmap.org",
-      "trogdor.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[umu]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[gateway]",
+  "role[web-storage]"
 )