Drop ascalon role

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

diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index 94a8989e1d8128ec42a6b2111cc95211f2b6f223..929639a23c15041aeb757a1d4a0104d12c7174ea 100644 (file)
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -12,9 +12,6 @@ default_attributes(
     }
   },
   :networking => {
-    :firewall => {
-      :engine => "nftables"
-    },
     :roles => {
       :internal => {
         :inet => {
@@ -35,12 +32,20 @@ default_attributes(
           :prefix => "64",
           :gateway => "2001:470:1:b3b::1",
           :routes => {
-            "2001:978:2:2c::/64" => { :type => "unreachable" }
+            "2600:9000::/28" => { :type => "unreachable" }
           }
         }
       }
     }
   },
+  :prometheus => {
+    :metrics => {
+      :host_location => {
+        :help => "Host location",
+        :labels => { :site => "dublin" }
+      }
+    }
+  },
   :web => {
     :fileserver => "fafnir",
     :readonly_database_host => "snap-03.dub.openstreetmap.org"
@@ -49,7 +54,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 => {