Revert "community: Fix CSRF issue with monkey patch fix"

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

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 91cd8f90324fb2bd8d47bc016310e0f77aad38ed..065be3faf0232baaa8c7535ec671149299a2fa4b 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -4,28 +4,49 @@ 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.64.4",
+        :inet => {
+          :address => "10.0.64.4"
+        },

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

+          :xmithashpolicy => "layer3+4",

           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },

-      :external_ipv4 => {
+      :external_he => {

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

-        :family => :inet,
-        :address => "184.104.226.100"
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.100",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::4",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }

       },
       },

-      :external_ipv6 => {
-        :interface => "bond0.101",
+      :external => {
+        :interface => "bond0.203",

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

-        :family => :inet6,
-        :address => "2001:470:1:b3b::4"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "87.252.214.100",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::4",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
+        }

       }
     }
   }
       }
     }
   }