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 74f368428de390c63b90fe79231a98bcef1d4650..065be3faf0232baaa8c7535ec671149299a2fa4b 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -4,41 +4,56 @@ 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.2",
+      :external_he => {
+        :interface => "bond0.101",

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

-        :family => :inet,
-        :address => "130.117.76.7"
+        :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.2",
+      :external => {
+        :interface => "bond0.203",

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

-        :family => :inet6,
-        :address => "2001:978:2:2C::172:7"
-      }
-    }
-  },
-  :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"
+        :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"
+        }

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

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

 )
 )