Merge remote-tracking branch 'github/pull/391'

[chef.git] / roles / equinix.rb

diff --git a/roles/equinix.rb b/roles/equinix.rb
index 9318fb2d055eabf2509a62bbff476528532ef0ff..e04f7fac5b253da09567e58567cda0af6757cf2d 100644 (file)
--- a/roles/equinix.rb
+++ b/roles/equinix.rb
@@ -3,13 +3,14 @@ description "Role applied to all servers at Equinix"
 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {

-    :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"],
-    :dnssec => "no",

     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",
     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",

-          :gateway => "10.0.48.10"
+          :gateway => "10.0.48.10",
+          :routes => {
+            "10.0.0.0/8" => { :via => "10.0.48.10" }
+          }

         }
       },
       :external => {
         }
       },
       :external => {


@@ -20,7 +21,12 @@ default_attributes(
         },
         :inet6 => {
           :prefix => "64",
         },
         :inet6 => {
           :prefix => "64",

-          :gateway => "2001:978:2:2C::172:1"
+          :gateway => "2001:978:2:2C::172:1",
+          :routes => {
+            "2001:978:2:2c::/64" => { :type => "unreachable" },
+            "2001:4860::/32" => { :type => "unreachable" },
+            "2a00:1450:4000::/37" => { :type => "unreachable" }
+          }

         }
       }
     }
         }
       }
     }


@@ -28,13 +34,14 @@ default_attributes(
   :web => {
     :backends => %w[rails1 rails2 rails3],
     :fileserver => "ironbelly",
   :web => {
     :backends => %w[rails1 rails2 rails3],
     :fileserver => "ironbelly",

-    :readonly_database_host => "karm.ams.openstreetmap.org",
+    :readonly_database_host => "snap-01.ams.openstreetmap.org",

     :primary_cluster => true
   }
 )
 
 override_attributes(
   :networking => {
     :primary_cluster => true
   }
 )
 
 override_attributes(
   :networking => {

+    :nameservers => ["66.28.0.45", "66.28.0.61"],

     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {