Remove otrs test role from naga

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

diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index fde95a21abfb1e748a0dd3f79ac9c68c277653f3..e24d71a1f1ece9599ff98c10a377e9c8a1cade91 100644 (file)
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -12,7 +12,6 @@ default_attributes(
     }
   },
   :networking => {
     }
   },
   :networking => {

-    :engine => "systemd-networkd",

     :roles => {
       :internal => {
         :inet => {
     :roles => {
       :internal => {
         :inet => {


@@ -31,14 +30,19 @@ default_attributes(
         },
         :inet6 => {
           :prefix => "64",
         },
         :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"
   :web => {
     :fileserver => "fafnir",
     :readonly_database_host => "snap-03.dub.openstreetmap.org"