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

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

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 1715e9d470d4db5d7012234d3c21e586280c4af3..d56d0540a16e3becdacfc2fc920e842777367bbb 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -14,7 +14,23 @@ default_attributes(
         }
       },
       :external => {
         }
       },
       :external => {

-        :zone => "ams"
+        :zone => "ams",
+        :inet => {
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
+      }
+    }
+  },
+  :prometheus => {
+    :metrics => {
+      :host_location => {
+        :help => "Host location",
+        :labels => { :site => "amsterdam" }

       }
     }
   },
       }
     }
   },


@@ -27,7 +43,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
 
 override_attributes(
   :networking => {

-    :nameservers => ["10.0.48.10", "8.8.8.8", "8.8.4.4"],
+    :nameservers => ["10.0.48.10", "74.82.42.42", "2001:470:20::2"],

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