Push external network config in Amsterdam down to the hosts

openstreetmap · May 23, 2023 · 9740294 · 9740294
1 parent 3a33d35
commit 9740294
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 32 deletions.
diff --git a/roles/dribble.rb b/roles/dribble.rb
@@ -21,10 +21,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.4"
+          :address => "130.117.76.4",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:4"
+          :address => "2001:978:2:2c::172:4",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
@@ -21,10 +21,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.9"
+          :address => "130.117.76.9",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:9"
+          :address => "2001:978:2:2c::172:9",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
@@ -14,18 +14,7 @@
         }
       },
       :external => {
-        :zone => "ams",
-        :inet => {
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
+        :zone => "ams"
       }
     }
   },

diff --git a/roles/faffy.rb b/roles/faffy.rb
@@ -21,10 +21,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.3"
+          :address => "130.117.76.3",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:3"
+          :address => "2001:978:2:2c::172:3",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
@@ -43,10 +43,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.10"
+          :address => "130.117.76.10",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:a"
+          :address => "2001:978:2:2c::172:a",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/norbert.rb b/roles/norbert.rb
@@ -21,10 +21,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.17"
+          :address => "130.117.76.17",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:11"
+          :address => "2001:978:2:2c::172:11",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/odin.rb b/roles/odin.rb
@@ -21,10 +21,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.15"
+          :address => "130.117.76.15",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:f"
+          :address => "2001:978:2:2c::172:f",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
@@ -21,10 +21,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.11"
+          :address => "130.117.76.11",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:b"
+          :address => "2001:978:2:2c::172:b",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/spike-07.rb b/roles/spike-07.rb
@@ -21,10 +21,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.12"
+          :address => "130.117.76.12",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:c"
+          :address => "2001:978:2:2c::172:c",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/spike-08.rb b/roles/spike-08.rb
@@ -21,10 +21,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.13"
+          :address => "130.117.76.13",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:d"
+          :address => "2001:978:2:2c::172:d",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
@@ -21,10 +21,17 @@
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.5"
+          :address => "130.117.76.5",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:5"
+          :address => "2001:978:2:2c::172:5",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }