Revert "Remove some redundant settings from chef server configuration"

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

diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index b511461ada8c5806cc6ad892c6a9da833dfd718d..640c67656e2ea95e7bfdfb4ee66811fbb3ee25bc 100644 (file)
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -4,26 +4,28 @@ description "Master role applied to spike-07"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.12",
+        :inet => {
+          :address => "10.0.48.7"
+        },
         :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.12"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:C"
+        :inet => {
+          :address => "184.104.179.135"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::7"
+        }
       }
     }
   }