Improve blackholing of AWS routes on he.net

diff --git a/cookbooks/networking/templates/default/network.erb b/cookbooks/networking/templates/default/network.erb
index 7f38de3c563d14bd1f37d13c08129766d94c6d1e..f837c65a5757bc9b95614fc3d814726a40ad0976 100644 (file)
--- a/cookbooks/networking/templates/default/network.erb
+++ b/cookbooks/networking/templates/default/network.erb
@@ -91,6 +91,9 @@ Destination=<%= destination %>
 <% if details[:metric] -%>
 Metric=<%= details[:metric] %>
 <% end -%>
 <% if details[:metric] -%>
 Metric=<%= details[:metric] %>
 <% end -%>

+<% if details[:table] -%>
+Table=<%= details[:table] %>
+<% end -%>

 <% if details[:type] -%>
 Type=<%= details[:type] %>
 <% end -%>
 <% if details[:type] -%>
 Type=<%= details[:type] %>
 <% end -%>


@@ -107,6 +110,9 @@ Destination=<%= destination %>
 <% if details[:metric] -%>
 Metric=<%= details[:metric] %>
 <% end -%>
 <% if details[:metric] -%>
 Metric=<%= details[:metric] %>
 <% end -%>

+<% if details[:table] -%>
+Table=<%= details[:table] %>
+<% end -%>

 <% if details[:type] -%>
 Type=<%= details[:type] %>
 <% end -%>
 <% if details[:type] -%>
 Type=<%= details[:type] %>
 <% end -%>

diff --git a/roles/equinix-ams-public.rb b/roles/equinix-ams-public.rb
index def6bc25f75208ab61642fd29dc8a93634e36ed1..a67b1bfcc10f543e3d0b4f474c707485643d818d 100644 (file)
--- a/roles/equinix-ams-public.rb
+++ b/roles/equinix-ams-public.rb
@@ -16,7 +16,10 @@ default_attributes(
         },
         :inet6 => {
           :prefix => "64",
         },
         :inet6 => {
           :prefix => "64",

-          :gateway => "2001:470:1:fa1::1"
+          :gateway => "2001:470:1:fa1::1",
+          :routes => {
+            "2600:9000::/28" => { :table => 3, :type => "unreachable" }
+          }

         }
       },
       :equinix => {
         }
       },
       :equinix => {

diff --git a/roles/equinix-dub-public.rb b/roles/equinix-dub-public.rb
index 4aea8ef630bfe5192eff98ab9e04c2d69d289181..3cac11b431f02b19ce6716960add6f6a5b6280c0 100644 (file)
--- a/roles/equinix-dub-public.rb
+++ b/roles/equinix-dub-public.rb
@@ -16,7 +16,10 @@ default_attributes(
         },
         :inet6 => {
           :prefix => 64,
         },
         :inet6 => {
           :prefix => 64,

-          :gateway => "2001:470:1:b3b::1"
+          :gateway => "2001:470:1:b3b::1",
+          :routes => {
+            "2600:9000::/28" => { :table => 101, :type => "unreachable" }
+          }

         }
       },
       :equinix => {
         }
       },
       :equinix => {


@@ -31,10 +34,7 @@ default_attributes(
         },
         :inet6 => {
           :prefix => 64,
         },
         :inet6 => {
           :prefix => 64,

-          :gateway => "2001:4d78:fe03:1c::1",
-          :rules => [
-            { :to => "2600:9000::/28", :table => 203, :priority => 100 }
-          ]
+          :gateway => "2001:4d78:fe03:1c::1"

         }
       }
     }
         }
       }
     }