Improve blackholing of AWS routes on he.net

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 7ca7094bc505779dd581478f7edfd388a8a83c73..e7edc263cdc3fbb94cb17c4d4c6be28b2059b3c2 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -19,47 +19,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.2"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.226.98",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.98"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::2",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::2"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.98",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.98"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::2",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::2"
         }
       }
     }
@@ -82,7 +62,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[gateway]",
   "role[mail]",