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

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

diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index c4f30e2ff90ffe4d4433d3ac89a61b1f2744c9ef..ccfe57645d33733b4ecfe73c0ae12f9b2a4eadaa 100644 (file)
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -30,14 +30,19 @@ default_attributes(
         },
         :inet6 => {
           :prefix => "64",
-          :gateway => "2001:470:1:b3b::1",
-          :routes => {
-            "2001:978:2:2c::/64" => { :type => "unreachable" }
-          }
+          :gateway => "2001:470:1:b3b::1"
         }
       }
     }
   },
+  :prometheus => {
+    :metrics => {
+      :host_location => {
+        :help => "Host location",
+        :labels => { :site => "dublin" }
+      }
+    }
+  },
   :web => {
     :fileserver => "fafnir",
     :readonly_database_host => "snap-03.dub.openstreetmap.org"
@@ -46,7 +51,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
-    :nameservers => ["10.0.64.2", "8.8.8.8", "8.8.4.4"],
+    :nameservers => ["10.0.64.2", "74.82.42.42", "2001:470:20::2"],
     :search => ["dub.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {