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

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

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index e0d03d2202aa5117e6ecb1567438d1038e7aa978..dfded54c3a07cc66121e00811c09cb6c15e8a7c5 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -4,42 +4,35 @@ description "Master role applied to spike-02"
 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.7",
+        :inet => {
+          :address => "10.0.64.4"
+        },

         :bond => {
         :bond => {

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

         }
       },
         }
       },

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

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

-        :family => :inet,
-        :address => "130.117.76.7"
-      },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1007"
-      # }
-    }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.eth0.autoconf" => "0",
-        "net.ipv6.conf.eth0.accept_ra" => "0"
+        :inet => {
+          :address => "184.104.226.100"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::4"
+        }

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[ic]",
-  "role[hp-dl360-g6]",
+  "role[equinix-dub]",
+  "role[hp-g9]",

   "role[web-frontend]"
 )
   "role[web-frontend]"
 )