Drop last traces of old shorewall firewall zones

[chef.git] / roles / faffy.rb

diff --git a/roles/faffy.rb b/roles/faffy.rb
index 59d2633e3b9e8bd6b9356cec10a8c4148df93674..e02510d18efa79e609dc6e3cebf377ad2f033f91 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -5,37 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.3"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.131",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.131"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::3"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.99",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.99"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::3"
         }
       }
     }
@@ -43,6 +33,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[dev]"
 )