From: Tom Hughes <tom@compton.nu>
Date: Sun, 11 Jun 2023 08:48:45 +0000 (+0100)
Subject: Drop cogent addresses from Amsterdam machines
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/f263015bff089f1d2ae00159cb5ae99c3d5f2850

Drop cogent addresses from Amsterdam machines
---

diff --git a/roles/dribble.rb b/roles/dribble.rb
index 41d790b0d..0bf3d0705 100644
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.4",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:4",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.132",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.132"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::4",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::4"
         }
       }
     }
diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index cc4e43c08..cb14058bc 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[ens18f0 ens18f1]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.9",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:9",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.137",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.137"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::9",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::9"
         }
       }
     }
diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 1715e9d47..7eb6cae11 100644
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -14,7 +14,15 @@ default_attributes(
         }
       },
       :external => {
-        :zone => "ams"
+        :zone => "ams",
+        :inet => {
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   },
diff --git a/roles/faffy.rb b/roles/faffy.rb
index ff956706f..c4963d181 100644
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.3",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:3",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.131",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.131"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::3",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::3"
         }
       }
     }
diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index a063d0d73..91edefceb 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -39,38 +39,14 @@ default_attributes(
           :slaves => %w[eth0 eth1]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.10",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:a",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.138",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.138"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::a",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::a"
         }
       }
     }
diff --git a/roles/norbert.rb b/roles/norbert.rb
index 3aee2928c..50b8566ea 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.17",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:11",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.145",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.145"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::11",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::11"
         }
       }
     }
diff --git a/roles/odin.rb b/roles/odin.rb
index c79f9c754..14b1f768e 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.15",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:f",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.143",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.143"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::f",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::f"
         }
       }
     }
diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index b9b414190..6be7da43d 100644
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.11",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:b",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.139",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.139"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::b",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::b"
         }
       }
     }
diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index 20f16fec5..7db381934 100644
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.12",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:c",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.140",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.140"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::c",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::c"
         }
       }
     }
diff --git a/roles/spike-08.rb b/roles/spike-08.rb
index 0cecb15aa..391206f36 100644
--- a/roles/spike-08.rb
+++ b/roles/spike-08.rb
@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.13",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:d",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.141",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.141"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::d",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::d"
         }
       }
     }
diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index c18fd1441..b06027cab 100644
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -17,38 +17,14 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.5",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:5",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.133",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.133"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::5",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::5"
         }
       }
     }