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

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index 88b23ab70afcc3b6b707ddd5c7c331ba6a56b79f..5cc06a4b144a5ad4aba76f0c765f86465a162642 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -2,62 +2,57 @@ name "fume"
 description "Master role applied to fume"
 
 default_attributes(
 description "Master role applied to fume"
 
 default_attributes(

-  :munin => {
-    :plugins => {
-      :df => {
-        :_dev_cciss_c0d1p1 => { :warning => ":95" }
-      }
-    }
-  },

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

-      :external_ipv4 => {
-        :interface => "eth0",
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.64.16"
+        },
+        :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 => "85.30.190.241",
-        :prefix => "29",
-        :gateway => "85.30.190.246"
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.112",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::10",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }

       },
       },

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

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

-        :family => :inet6,
-        :address => "2a02:80:0:3ff8:222:64ff:fe2a:2714",
-        :prefix => "64"
-      }
-    }
-  },
-  :squid => {
-    :cache_mem => "16000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/cciss\!c0d0/queue/nr_requests" => "512",
-        "block/cciss\!c0d1/queue/nr_requests" => "512",
-        "block/cciss\!c0d0/queue/scheduler" => "noop",
-        "block/cciss\!c0d1/queue/scheduler" => "noop"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "87.252.214.112",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::10",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
+        }

       }
     }
       }
     }

-  },
-  :tilecache => {
-    :tile_parent => "sjobo.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "nepomuk.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[teleservice]",
-  "role[geodns]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[community]"

 )
 )