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

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

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index 50379928c1b2d1a47f0c471e1cf119c40cd4d9e8..dd754a7ba45baa83a5660aec60ac386ca47a29c1 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -4,11 +4,12 @@ description "Master role applied to spike-06"
 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.11",
+        :inet => {
+          :address => "10.0.48.6"
+        },

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


@@ -16,17 +17,36 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
           :slaves => %w[eno1 eno2]
         }
       },

-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external_he => {
+        :interface => "bond0.3",

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

-        :family => :inet,
-        :address => "130.117.76.11"
+        :metric => 150,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.179.134",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::6",
+          :prefix => 64,
+          :gateway => "2001:470:1:fa1::1"
+        }

       },
       },

-      :external_ipv6 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.103",

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

-        :family => :inet6,
-        :address => "2001:978:2:2C::172:B"
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.102",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::6",
+          :prefix => 64,
+          :gateway => "2001:4d78:500:5e3::1"
+        }

       }
     }
   }
       }
     }
   }