From: Tom Hughes <tom@compton.nu>
Date: Fri, 31 May 2024 23:07:43 +0000 (+0100)
Subject: Revert "Move Amsterdam site gateway to norbert"
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain

Revert "Move Amsterdam site gateway to norbert"

This reverts commit 04a8aea0708afb576b70ac823abd5d6bad2372c6.
---

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 771586a8d..7923e09d4 100644
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -7,9 +7,9 @@ default_attributes(
       :internal => {
         :inet => {
           :prefix => "20",
-          :gateway => "10.0.48.17",
+          :gateway => "10.0.48.10",
           :routes => {
-            "10.0.0.0/8" => { :via => "10.0.48.17" }
+            "10.0.0.0/8" => { :via => "10.0.48.10" }
           }
         }
       },
diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 70ae3b14e..558495859 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -108,6 +108,7 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
+  "role[gateway]",
   "recipe[rsyncd]",
   "recipe[dhcpd]",
   "recipe[imagery::za_ngi_aerial]"
diff --git a/roles/norbert.rb b/roles/norbert.rb
index 7c31bb8f4..50b8566ea 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 => {
@@ -40,11 +36,9 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
-  "role[gateway]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",
   "role[planetdump]",
-  "recipe[dhcpd]",
   "recipe[tilelog]"
 )