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

[chef.git] / roles / faffy.rb

diff --git a/roles/faffy.rb b/roles/faffy.rb
index fd294f1fa3abf9b461e66f7cae19403e63bb4996..c4963d181d276f936173aa090941dc7a58415999 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -4,26 +4,28 @@ description "Master role applied to faffy"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.48.3",
+        :inet => {
+          :address => "10.0.48.3"
+        },

         :bond => {
         :bond => {

-          :slaves => %w[eno1 eno2]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]

         }
       },
         }
       },

-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",

         :role => :external,
         :role => :external,

-        :family => :inet,
-        :address => "130.117.76.3"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:3"
+        :inet => {
+          :address => "184.104.179.131"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::3"
+        }

       }
     }
   }
       }
     }
   }