X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/68e068818d559ef35bdf2a138a93596337828ef9..63499170498deaea484d0f4d2bceac1ecee5f635:/roles/tabaluga.rb?ds=sidebyside

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 8094e63c0..11678ec07 100644
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -3,16 +3,17 @@ description "Master role applied to tabaluga"
 
 default_attributes(
   :dhcpd => {
-    :first_address => "10.0.62.1",
-    :last_address => "10.0.62.254"
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
   },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.14",
+        :inet => {
+          :address => "10.0.48.14"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -20,17 +21,41 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external_he => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.14"
+        :metric => 150,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.179.142",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.103",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:E"
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.110",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
+        }
+      }
+    }
+  },
+  :prometheus => {
+    :junos => {
+      "switch1" => { :address => "184.104.179.129", :labels => { "site" => "amsterdam" } }
+    },
+    :snmp => {
+      "pdu1" => { :address => "10.0.48.100", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
+      "pdu2" => { :address => "10.0.48.101", :modules => %w[apcups], :labels => { "site" => "amsterdam" } }
+    },
+    :metrics => {
+      :uplink_interface => {
+        :help => "Site uplink interface name",
+        :labels => { :site => "amsterdam", :name => "ge-[01]/2/[02]" }
       }
     }
   }
@@ -39,6 +64,8 @@ default_attributes(
 run_list(
   "role[equinix-ams]",
   "role[hp-g9]",
-  "role[wiki]",
+  "role[blog-staging]",
+  "role[taginfo]",
+  "role[gateway]",
   "recipe[dhcpd]"
 )