Add email handling and fixes

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 6e3ee6834f9bbc36c9549ab8484e94ff3e351511..735f8c1ad941bf775a7bce0b52f6043b8e80dce5 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -4,42 +4,35 @@ description "Master role applied to konqi"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.64.7",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "bond0.101",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "81.7.11.83",
-        :prefix => "24",
-        :gateway => "81.7.11.1"
+        :address => "184.104.226.103"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "eth0",
+        :interface => "bond0.101",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2a02:180:1:1::517:b53",
-        :prefix => "64",
-        :gateway => "2a02:180:1:1::1"
+        :address => "2001:470:1:b3b::7"

       }
     }
       }
     }

-  },
-  :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "germany.render.openstreetmap.org",
-    :tile_siblings => [
-      "katie.openstreetmap.org",
-      "trogdor.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "simurgh.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[euserv]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-g9]"

 )
 )