From: Tom Hughes <tom@compton.nu>
Date: Fri, 7 Mar 2025 09:49:25 +0000 (+0000)
Subject: Introduce equinix-ams-public role for servers with public addresses
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/eef994618da6713599b6ed170bfb646ebc567948

Introduce equinix-ams-public role for servers with public addresses
---

diff --git a/roles/dribble.rb b/roles/dribble.rb
index 75b09f26b..b0bba8021 100644
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -40,6 +40,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[vectortile]"
 )
diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index e754f61be..cc6b24fe6 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -49,6 +49,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[nominatim]"
 )
diff --git a/roles/equinix-ams-public.rb b/roles/equinix-ams-public.rb
new file mode 100644
index 000000000..993960548
--- /dev/null
+++ b/roles/equinix-ams-public.rb
@@ -0,0 +1,43 @@
+name "equinix-ams-public"
+description "Role applied to all public servers at Equinix Amsterdam"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :henet => {
+        :interface => "bond0.3",
+        :role => :external,
+        :zone => "ams",
+        :metric => 150,
+        :source_route_table => 3,
+        :inet => {
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
+      },
+      :equinix => {
+        :interface => "bond0.103",
+        :role => :external,
+        :zone => "ams",
+        :metric => 100,
+        :source_route_table => 103,
+        :inet => {
+          :prefix => "27",
+          :gateway => "82.199.86.97"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2001:4d78:500:5e3::1"
+        }
+      }
+    }
+  }
+)
+
+run_list(
+  "role[equinix-ams-public]"
+)
diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 1c14a5d9f..8cf64cca7 100644
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -19,36 +19,6 @@ default_attributes(
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4"
         }
-      },
-      :henet => {
-        :interface => "bond0.3",
-        :role => :external,
-        :zone => "ams",
-        :metric => 150,
-        :source_route_table => 3,
-        :inet => {
-          :prefix => "27",
-          :gateway => "184.104.179.129"
-        },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
-        }
-      },
-      :equinix => {
-        :interface => "bond0.103",
-        :role => :external,
-        :zone => "ams",
-        :metric => 100,
-        :source_route_table => 103,
-        :inet => {
-          :prefix => "27",
-          :gateway => "82.199.86.97"
-        },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:4d78:500:5e3::1"
-        }
       }
     }
   },
diff --git a/roles/faffy.rb b/roles/faffy.rb
index 95774d0f8..e02510d18 100644
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -33,6 +33,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[dev]"
 )
diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index 8fd06591b..82acb48b4 100644
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -82,7 +82,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[hp-g9]",
   "role[imagery]"
 )
diff --git a/roles/norbert.rb b/roles/norbert.rb
index 32b901afa..357dc0d5a 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -36,7 +36,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",
diff --git a/roles/odin.rb b/roles/odin.rb
index 178fd97db..9d5bd1cfc 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -125,6 +125,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[tile]"
 )
diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index d7f3b35a3..b5d84e6a6 100644
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -33,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[hp-g9]",
   "role[web-frontend]",
   "role[web-statistics]",
diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index 47649fa8b..166432919 100644
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -33,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[hp-g9]",
   "role[web-frontend]"
 )
diff --git a/roles/spike-08.rb b/roles/spike-08.rb
index f1e667fa5..46f0be788 100644
--- a/roles/spike-08.rb
+++ b/roles/spike-08.rb
@@ -33,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[hp-g9]",
   "role[web-frontend]"
 )
diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 569aa7740..1ad1ee227 100644
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -52,7 +52,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[hp-g9]",
   "role[blog-staging]",
   "role[taginfo]",
diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index f79dbb6f3..c8cd4a92f 100644
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -40,6 +40,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[nominatim]"
 )