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

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index 37511e2f26079b61d77735c7740ce242c997fc08..525e028d213792ec02adbb5f82fbf3f3fc271dbc 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -2,38 +2,57 @@ name "grisu"
 description "Master role applied to grisu"
 
 default_attributes(
 description "Master role applied to grisu"
 
 default_attributes(

-  :accounts => {
-    :users => {
-      :yellowbkpk => { :status => :administrator }
-    }
-  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
-        :interface => "eth0",
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.64.17"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
+        }
+      },
+      :external_he => {
+        :interface => "bond0.101",

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

-        :family => :inet,
-        :address => "142.4.213.166",
-        :prefix => "24",
-        :gateway => "142.4.213.254"
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.113",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::11",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }

       },
       },

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

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

-        :family => :inet6,
-        :address => "2607:5300:60:12a6::1",
-        :prefix => "64",
-        :gateway => "2607:5300:60:12ff:ff:ff:ff:ff"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "87.252.214.113",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::11",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
+        }

       }
     }
       }
     }

-  },
-  :squid => {
-    :cache_mem => "9000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ovh-ca]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[overpass-query]"

 )
 )