Enable gpximport, statistics and cleanup roles on spike-01

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 0e4ad9aa087704e030531382151bf7951b0efc63..38a0a461896dba431b91d12a3704c1ee8db9f200 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "p4p1",

         :role => :external,
         :family => :inet,
         :address => "81.7.11.83",
         :role => :external,
         :family => :inet,
         :address => "81.7.11.83",


@@ -13,10 +13,10 @@ default_attributes(
         :gateway => "81.7.11.1"
       },
       :external_ipv6 => {
         :gateway => "81.7.11.1"
       },
       :external_ipv6 => {

-        :interface => "eth0",
+        :interface => "p4p1",

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

-        :address => "2a02:180:1:1::517:ad5",
+        :address => "2a02:180:1:1::517:b53",

         :prefix => "64",
         :gateway => "2a02:180:1:1::1"
       }
         :prefix => "64",
         :gateway => "2a02:180:1:1::1"
       }


@@ -27,16 +27,14 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {

-    :tile_parent => "falkenstein.render.openstreetmap.org",
+    :tile_parent => "germany.render.openstreetmap.org",

     :tile_siblings => [
     :tile_siblings => [

-       "tabaluga.openstreetmap.org",
-       "katie.openstreetmap.org",
-       "trogdor.openstreetmap.org",
-       "nepomuk.openstreetmap.org",
-       "ridgeback.openstreetmap.org",
-       "fume.openstreetmap.org",
-       "gorynych.openstreetmap.org",
-       "simurgh.openstreetmap.org"
+      "katie.openstreetmap.org",
+      "trogdor.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"

     ]
   }
 )
     ]
   }
 )