Avoid double call to ip2region; consolidate rewrite conditions

[chef.git] / roles / faffy.rb

diff --git a/roles/faffy.rb b/roles/faffy.rb
index 4a21fae6100ea7ed1f2257d3259cf0b6a285374c..c4963d181d276f936173aa090941dc7a58415999 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -18,20 +18,13 @@ default_attributes(
         }
       },
       :external => {
-        :interface => "bond0.2",
+        :interface => "bond0.3",
         :role => :external,
         :inet => {
-          :address => "130.117.76.3",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
+          :address => "184.104.179.131"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:3",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :address => "2001:470:1:fa1::3"
         }
       }
     }