Merge remote-tracking branch 'github/pull/724'

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index c443332c2e493096f626108862d76ff755892d49..d3bfcc1157ea1f1c6eecb85411223958a2c97aec 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -7,6 +7,7 @@ default_attributes(
     :last_address => "10.0.79.254"
   },
   :exim => {
+    :external_interface => "<;${if <{${randint:100}}{90} {184.104.226.98;2001:470:1:b3b::2}{87.252.214.98;2001:4d78:fe03:1c::2}}",
     :routes => {
       :openstreetmap => {
         :comment => "openstreetmap.org",
@@ -30,14 +31,35 @@ 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",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :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 => "184.104.226.98"
+          :address => "87.252.214.98",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::2"
+          :address => "2001:4d78:fe03:1c::2",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }