Revert "community: Fix CSRF issue with monkey patch fix"

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 58876af4b5b43b286e044e9adc76266fb583e17f..bb6b7b667e4a9928015d9e545e8b07a6fd1288f7 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -30,28 +30,51 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.226.98"
+          :address => "184.104.226.98",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::2"
+          :address => "2001:470:1:b3b::2",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "87.252.214.98",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::2",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
   },
   :prometheus => {
+    :junos => {
+      "switch1" => { :address => "184.104.226.97", :labels => { "site" => "dublin" } }
+    },
     :snmp => {
       "pdu1" => { :address => "10.0.64.100", :modules => %w[apcups], :labels => { "site" => "dublin" } },
-      "pdu2" => { :address => "10.0.64.101", :modules => %w[apcups], :labels => { "site" => "dublin" } },
-      "switch1" => { :address => "184.104.226.97", :modules => %w[if_mib juniper_ex4300], :labels => { "site" => "dublin" } }
+      "pdu2" => { :address => "10.0.64.101", :modules => %w[apcups], :labels => { "site" => "dublin" } }
     },
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",
-        :labels => { :site => "dublin", :name => "ae50" }
+        :labels => { :site => "dublin", :name => "xe-[01]/2/[01]|ge-[01]/2/2" }
       }
     }
   }