supybot: fix planet-dump-ng commit link typo

[chef.git] / roles / tabaluga.rb

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 6ba4c3b7d2d440adcce61dbd2800aa4c381ad62c..c891fa8948c6012c3902d8102a643d64019f1fa1 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -4,36 +4,35 @@ description "Master role applied to tabaluga"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet,
-        :address => "5.9.150.236",
-        :prefix => "27",
-        :gateway => "5.9.150.225"
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.48.14"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2]
+        }

       },
       },

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

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

-        :family => :inet6,
-        :address => "2a01:4f8:190:33eb::2",
-        :prefix => "64",
-        :gateway => "fe80::1"
+        :inet => {
+          :address => "184.104.179.142"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::e"
+        }

       }
     }
       }
     }

-  },
-  :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :ip_bucket_refill => "6144",
-    :net_bucket_refill => "24576",
-    :tile_parent => "orm.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[hetzner]",
-  "role[tilecache]"
+  "role[equinix-ams]",
+  "role[hp-g9]",
+  "role[blog-staging]"

 )
 )