Improve routing policy rules for Dublin

diff --git a/roles/equinix-dub-public.rb b/roles/equinix-dub-public.rb
index e00975a76f97f625c0feec93dc0d6b89cc6f3530..4aea8ef630bfe5192eff98ab9e04c2d69d289181 100644 (file)
--- a/roles/equinix-dub-public.rb
+++ b/roles/equinix-dub-public.rb
@@ -12,19 +12,11 @@ default_attributes(
         :source_route_table => 101,
         :inet => {
           :prefix => "27",
-          :gateway => "184.104.226.97",
-          :rules => [
-            { :to => "10.0.0.0/8", :table => "main", :priority => 50 },
-            { :to => "172.16.0.0/12", :table => "main", :priority => 50 },
-            { :to => "192.168.0.0/16", :table => "main", :priority => 50 }
-          ]
+          :gateway => "184.104.226.97"
         },
         :inet6 => {
           :prefix => 64,
-          :gateway => "2001:470:1:b3b::1",
-          :rules => [
-            { :to => "2600:9000::/28", :table => 150, :priority => 100 }
-          ]
+          :gateway => "2001:470:1:b3b::1"
         }
       },
       :equinix => {
@@ -39,7 +31,10 @@ default_attributes(
         },
         :inet6 => {
           :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :gateway => "2001:4d78:fe03:1c::1",
+          :rules => [
+            { :to => "2600:9000::/28", :table => 203, :priority => 100 }
+          ]
         }
       }
     }

diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index 716f0ff7c5026513df2266add6b4bf11bfc89cbe..741c09ab7b7276432f4582f800f0b64708f5ecad 100644 (file)
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -22,7 +22,12 @@ default_attributes(
           :gateway => "10.0.64.2",
           :routes => {
             "10.0.0.0/8" => { :via => "10.0.64.2" }
-          }
+          },
+          :rules => [
+            { :to => "10.0.0.0/8", :table => "main", :priority => 50 },
+            { :to => "172.16.0.0/12", :table => "main", :priority => 50 },
+            { :to => "192.168.0.0/16", :table => "main", :priority => 50 }
+          ]
         },
         :bond => {
           :mode => "802.3ad",