imagery: use new custom command

[chef.git] / roles / equinix-dub.rb

diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index 929639a23c15041aeb757a1d4a0104d12c7174ea..9652c2c8c19485bc2f13b304f2da5204706cb99a 100644 (file)
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -25,15 +25,16 @@ default_attributes(
       :external => {
         :zone => "dub",
         :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 }
+          ]
         },
         :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:470:1:b3b::1",
-          :routes => {
-            "2600:9000::/28" => { :type => "unreachable" }
-          }
+          :rules => [
+            { :to => "2600:9000::/28", :table => 150, :priority => 100 }
+          ]
         }
       }
     }
@@ -47,7 +48,6 @@ default_attributes(
     }
   },
   :web => {
-    :fileserver => "fafnir",
     :readonly_database_host => "snap-03.dub.openstreetmap.org"
   }
 )