From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Dec 2024 11:37:38 +0000 (+0000)
Subject: Add new Equinix addresses to Dublin hosts
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/9e3d6bc2332036591015cf6171a685536e26b3c1?hp=6ca4c5b1adbeff9556a2f63e7716d21d02495901

Add new Equinix addresses to Dublin hosts
---

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 4cdf87caf..d798bddae 100644
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.105",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::9",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.105"
+          :address => "87.252.214.105",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::9"
+          :address => "2001:4d78:fe03:1c::9",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index 8008210ad..11e6ea85d 100644
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -24,13 +24,7 @@ default_attributes(
       },
       :external => {
         :zone => "dub",
-        :inet => {
-          :prefix => "27",
-          :gateway => "184.104.226.97"
-        },
         :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:470:1:b3b::1",
           :routes => {
             "2600:9000::/28" => { :type => "unreachable" }
           }
diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index c443332c2..bb6b7b667 100644
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -30,14 +30,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.98",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::2",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.98"
+          :address => "87.252.214.98",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::2"
+          :address => "2001:4d78:fe03:1c::2",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/fume.rb b/roles/fume.rb
index 0afb0936c..5cc06a4b1 100644
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.112",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::10",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.112"
+          :address => "87.252.214.112",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::10"
+          :address => "2001:4d78:fe03:1c::10",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/grisu.rb b/roles/grisu.rb
index 17b0aaa55..525e028d2 100644
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.113",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::11",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.113"
+          :address => "87.252.214.113",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::11"
+          :address => "2001:4d78:fe03:1c::11",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/horntail.rb b/roles/horntail.rb
index afaf9460d..d071856f4 100644
--- a/roles/horntail.rb
+++ b/roles/horntail.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.106",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::a",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.106"
+          :address => "87.252.214.106",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::a"
+          :address => "2001:4d78:fe03:1c::a",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/idris.rb b/roles/idris.rb
index b0edcc141..7467f67af 100644
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.102",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::6",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.102"
+          :address => "87.252.214.102",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::6"
+          :address => "2001:4d78:fe03:1c::6",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/konqi.rb b/roles/konqi.rb
index b23841de2..4b1fbcea6 100644
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.103",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::7",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.103"
+          :address => "87.252.214.103",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::7"
+          :address => "2001:4d78:fe03:1c::7",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/longma.rb b/roles/longma.rb
index e4b3ebc55..b8bf00af1 100644
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[enp68s0f0np0 enp68s0f1np1 enp68s0f2np2 enp68s0f3np3]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.109",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::d",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.109"
+          :address => "87.252.214.109",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::d"
+          :address => "2001:4d78:fe03:1c::d",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/muirdris.rb b/roles/muirdris.rb
index 81cb63953..b77e4f8df 100644
--- a/roles/muirdris.rb
+++ b/roles/muirdris.rb
@@ -20,14 +20,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.111",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::f",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.111"
+          :address => "87.252.214.111",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::f"
+          :address => "2001:4d78:fe03:1c::f",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/naga.rb b/roles/naga.rb
index da7d39cd8..d212b6680 100644
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.104",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::8",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.104"
+          :address => "87.252.214.101",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::8"
+          :address => "2001:4d78:fe03:1c::8",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/smaug.rb b/roles/smaug.rb
index fd7474714..4156fcb99 100644
--- a/roles/smaug.rb
+++ b/roles/smaug.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.110",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::e",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.110"
+          :address => "87.252.214.110",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::e"
+          :address => "2001:4d78:fe03:1c::e",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 5f048e341..80b56c5e1 100644
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.99",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::3",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.99"
+          :address => "87.252.214.99",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::3"
+          :address => "2001:4d78:fe03:1c::3",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index dfded54c3..065be3faf 100644
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.100",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::4",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.100"
+          :address => "87.252.214.100",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::4"
+          :address => "2001:4d78:fe03:1c::4",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index f2803fc23..b620aecfc 100644
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.101",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::5",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.101"
+          :address => "87.252.214.101",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::5"
+          :address => "2001:4d78:fe03:1c::5",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }