Make the GeoIP database directory vary with the OS version

[chef.git] / roles / tabaluga.rb

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 66840f9baca4e9b2603830319a1aae679d827721..191c92d3e0a1d93c0a6129a2764720ba444c96cf 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,44 +2,40 @@ name "tabaluga"
 description "Master role applied to tabaluga"
 
 default_attributes(
 description "Master role applied to tabaluga"
 
 default_attributes(

+  :dhcpd => {
+    :first_address => "10.0.62.1",
+    :last_address => "10.0.62.254"
+  },

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

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.14",
+        :bond => {
+          :slaves => %w[eno1 eno2]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

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

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

-        :address => "5.9.150.236",
-        :prefix => "27",
-        :gateway => "5.9.150.225"
+        :address => "130.117.76.14"

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

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

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

-        :address => "2a01:4f8:190:33eb::2",
-        :prefix => "64",
-        :gateway => "fe80::1"
+        :address => "2001:978:2:2C::172:E"

       }
     }
       }
     }

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

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[hetzner]",
-  "role[tilecache]"
+  "role[equinix-ams]",
+  "role[hp-g9]",
+  "role[wiki]",
+  "recipe[dhcpd]"

 )
 )