Make sure mod_php is disabled when we're using FPM

[chef.git] / roles / equinix.rb

diff --git a/roles/equinix.rb b/roles/equinix.rb
index 8b711a2961a206276e70b4d84b186f4a12c92a05..85b11110619aff348748cf412b549935eef28f92 100644 (file)
--- a/roles/equinix.rb
+++ b/roles/equinix.rb
@@ -3,8 +3,7 @@ description "Role applied to all servers at Equinix"
 
 default_attributes(
   :networking => {
-    :netplan => true,
-    :nameservers => ["66.28.0.45", "66.28.0.61", "2001:978:1:1::d", "2001:978:1:2::d"],
+    :nameservers => ["66.28.0.45", "66.28.0.61"],
     :roles => {
       :internal => {
         :inet => {
@@ -20,7 +19,12 @@ default_attributes(
         },
         :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,7 +32,8 @@ default_attributes(
   :web => {
     :backends => %w[rails1 rails2 rails3],
     :fileserver => "ironbelly",
-    :readonly_database_host => "karm.ams.openstreetmap.org"
+    :readonly_database_host => "karm.ams.openstreetmap.org",
+    :primary_cluster => true
   }
 )