Revert "Remove some redundant settings from chef server configuration"

[chef.git] / roles / spike-03.rb

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

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

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

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

         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",

-          :slaves => %w[eno1 eno2]
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]

         }
       },
         }
       },

-      :external_ipv4 => {
+      :external => {

         :interface => "bond0.101",
         :role => :external,
         :interface => "bond0.101",
         :role => :external,

-        :family => :inet,
-        :address => "184.104.226.101"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::5"
+        :inet => {
+          :address => "184.104.226.101"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::5"
+        }

       }
     }
   }
       }
     }
   }