X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d29e6aa0b03a30551cbbdadc9354aedd4231929d..cf104d6ba87464701b5abe7ce7264ecbc0c261b9:/roles/tabaluga.rb

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index af0ea0edd..0e7296b33 100644
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,43 +2,40 @@ name "tabaluga"
 description "Master role applied to tabaluga"
 
 default_attributes(
+  :dhcpd => {
+    :first_address => "10.0.62.1",
+    :last_address => "10.0.62.254"
+  },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.14",
+        :bond => {
+          :slaves => %w[eno1 eno2]
+        }
+      },
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "5.9.150.236",
-        :prefix => "27",
-        :gateway => "5.9.150.225"
+        :address => "130.117.76.14"
       },
       :external_ipv6 => {
-        :interface => "eth0",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2a01:4f8:190:33eb::2",
-        :prefix => "64",
-        :gateway => "fe80::1"
+        :address => "2001:978:2:2C::172:E"
       }
     }
-  },
-  :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :ip_bucket_refill => "6144",
-    :net_bucket_refill => "24576",
-    :tile_parent => "falkenstein.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "lurien.openstreetmap.org",
-      "ridgeback.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[hetzner]",
-  "role[tilecache]"
+  "role[equinix]",
+  "role[hp-g9]",
+  "role[wiki]",
+  "recipe[dhcpd]"
 )