From a6ecb3790efd24b4d6cc3e9fe6d0bf26b5a038cc Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 May 2026 20:22:32 +0100
Subject: [PATCH] Revert "Move amsterdam gateway to norbert"

This reverts commit 5f06d84be813e0e7c4f95ed9e94e33444d463e38.
---
 roles/equinix-ams.rb | 2 +-
 roles/norbert.rb     | 6 ------
 roles/tabaluga.rb    | 8 +++++++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 09e794efb..cb8a273ca 100644
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -20,7 +20,7 @@ default_attributes(
         :metric => 200,
         :inet => {
           :prefix => "20",
-          :gateway => "10.0.48.17",
+          :gateway => "10.0.48.14",
           :routes => {
             "10.0.0.0/8" => { :via => "10.0.48.14" }
           }
diff --git a/roles/norbert.rb b/roles/norbert.rb
index bea6a941a..3fe5fae6e 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,10 +2,6 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
-  :dhcpd => {
-    :first_address => "10.0.63.1",
-    :last_address => "10.0.63.254"
-  },
   :networking => {
     :interfaces => {
       :internal => {
@@ -45,7 +41,5 @@ run_list(
   "role[backup]",
   "role[planet]",
   "role[planetdump]",
-  "role[gateway]",
-  "recipe[dhcpd]",
   "recipe[tilelog]"
 )
diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 4840b39c5..e40923637 100644
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,6 +2,10 @@ name "tabaluga"
 description "Master role applied to tabaluga"
 
 default_attributes(
+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },
   :networking => {
     :interfaces => {
       :internal => {
@@ -51,5 +55,7 @@ run_list(
   "role[equinix-ams-public]",
   "role[hp-g9]",
   "role[blog-staging]",
-  "role[taginfo]"
+  "role[taginfo]",
+  "role[gateway]",
+  "recipe[dhcpd]"
 )
-- 
2.39.5