ironbelly: update interface names

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

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 13ab238788506d2f69216907f62dec5f4ea0cd17..771586a8de7cf1afa9ee9a77ddfdfca01e907c74 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -3,16 +3,13 @@ description "Role applied to all servers at Equinix Amsterdam"
 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {

-    :firewall => {
-      :engine => "nftables"
-    },

     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",
     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",

-          :gateway => "10.0.48.10",
+          :gateway => "10.0.48.17",

           :routes => {
           :routes => {

-            "10.0.0.0/8" => { :via => "10.0.48.10" }
+            "10.0.0.0/8" => { :via => "10.0.48.17" }

           }
         }
       },
           }
         }
       },


@@ -20,21 +17,23 @@ default_attributes(
         :zone => "ams",
         :inet => {
           :prefix => "27",
         :zone => "ams",
         :inet => {
           :prefix => "27",

-          :gateway => "130.117.76.1"
+          :gateway => "184.104.179.129"

         },
         :inet6 => {
           :prefix => "64",
         },
         :inet6 => {
           :prefix => "64",

-          :gateway => "2001:978:2:2C::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" },
-            "2001:978:2:2c::/64" => { :type => "unreachable" },
-            "2001:4860::/32" => { :type => "unreachable" },
-            "2a00:1450:4000::/37" => { :type => "unreachable" }
-          }
+          :gateway => "2001:470:1:fa1::1"

         }
       }
     }
   },
         }
       }
     }
   },

+  :prometheus => {
+    :metrics => {
+      :host_location => {
+        :help => "Host location",
+        :labels => { :site => "amsterdam" }
+      }
+    }
+  },

   :web => {
     :fileserver => "ironbelly",
     :readonly_database_host => "snap-01.ams.openstreetmap.org",
   :web => {
     :fileserver => "ironbelly",
     :readonly_database_host => "snap-01.ams.openstreetmap.org",