Add new Equinix addresses to Dublin hosts

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 4cdf87cafb3da6c85ef9573ed7ba5a60ea7d192a..d798bddaecc0c34f4b682499047d1bd2b8c9f243 100644 (file)
--- 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 8008210ad5d9e0c246eeb0c8d5fa820491baeee2..11e6ea85d971988d40649c2199fcae4e7acf2dfa 100644 (file)
--- 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 c443332c2e493096f626108862d76ff755892d49..bb6b7b667e4a9928015d9e545e8b07a6fd1288f7 100644 (file)
--- 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 0afb0936c51f5d72613fc4ceb557d9fa44dafdcf..5cc06a4b144a5ad4aba76f0c765f86465a162642 100644 (file)
--- 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 17b0aaa556fe9c64b8558e12f34dac231626e369..525e028d213792ec02adbb5f82fbf3f3fc271dbc 100644 (file)
--- 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 afaf9460d07e3238220b08091618e8e85423ca9c..d071856f41047fd80210dd088cf18afd885885ba 100644 (file)
--- 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 b0edcc1413810a7faa6a2fc4b01f630a0d6630f1..7467f67af03f498ec8fdbf744859d40bddb96389 100644 (file)
--- 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 b23841de21f8a159eacd06ddee4e1d678149d4b3..4b1fbcea6cf1c4fff0ad8361b8ada91d93acc770 100644 (file)
--- 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 e4b3ebc556104af75ea66da98c0241ac7c0b1e00..b8bf00af1d950861ec0aac1b72cc290f1e4e883f 100644 (file)
--- 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 81cb6395367c8b980852cb4645c1e2a895ab839d..b77e4f8df859371857bf90a458fa1371e5692c7b 100644 (file)
--- 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 da7d39cd81d1ac5366e52a3d3b8c34ab58be68bf..d212b66807c3cdfa0e8d970a3209bc035ec4f982 100644 (file)
--- 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 fd747471439445457def9c813998e7b94246e424..4156fcb9903d5a7a5be8a933de5832bfb90b19ed 100644 (file)
--- 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 5f048e341a6c26209fc534cea19a5a1aa6e3328e..80b56c5e1e7a9f416417ddb1efcdbb150d6a6445 100644 (file)
--- 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 dfded54c3a07cc66121e00811c09cb6c15e8a7c5..065be3faf0232baaa8c7535ec671149299a2fa4b 100644 (file)
--- 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 f2803fc23d1f78ddd9b66f73dfc18c501232aebc..b620aecfc95f692171c720e9fcdba1b47cb19af0 100644 (file)
--- 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"
         }
       }
     }