Revert "Blackhole unreachable Amazon IPv6 block on equinix machines"

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index 8ef9e826dbfb0f5a30683474474954caa0eefff6..5b4c5a670ac12ea6d5d06a36866e2c5be272fe44 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -4,44 +4,34 @@ description "Master role applied to fume"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet,
-        :address => "85.30.190.241",
-        :prefix => "29",
-        :gateway => "85.30.190.246"
+      :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_ipv6 => {
-        :interface => "eth0",
+      :external => {
+        :interface => "bond0.101",

         :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"
+        :inet => {
+          :address => "184.104.226.112"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::10"
+        }

       }
     }
       }
     }

-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[teleservice]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[blog-staging]"

 )
 )