Remove fume and provision geodns on ridgeback

diff --git a/roles/cmok.rb b/roles/cmok.rb
index 1cbe31d5721aa4fe2e1475c8ea5cb3c825e60f56..07057adfa1760d3ad42a6ca823b50080e4f59e3f 100644 (file)
--- a/roles/cmok.rb
+++ b/roles/cmok.rb
@@ -33,7 +33,6 @@ default_attributes(
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
       "gorynych.openstreetmap.org"
     ]
   }

diff --git a/roles/fume.rb b/roles/fume.rb
deleted file mode 100644 (file)
index 88b23ab..0000000
--- a/roles/fume.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-name "fume"
-description "Master role applied to fume"
-
-default_attributes(
-  :munin => {
-    :plugins => {
-      :df => {
-        :_dev_cciss_c0d1p1 => { :warning => ":95" }
-      }
-    }
-  },
-  :networking => {
-    :interfaces => {
-      :external_ipv4 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet,
-        :address => "85.30.190.241",
-        :prefix => "29",
-        :gateway => "85.30.190.246"
-      },
-      :external_ipv6 => {
-        :interface => "eth0",
-        :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"
-      }
-    }
-  },
-  :tilecache => {
-    :tile_parent => "sjobo.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "nepomuk.openstreetmap.org"
-    ]
-  }
-)
-
-run_list(
-  "role[teleservice]",
-  "role[geodns]",
-  "role[tilecache]"
-)

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 101e9d083004ed7dad10902809e03bf49cc6b3ba..597951828a83e55dff72bcecbdd54c4f8a1f4afe 100644 (file)
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -49,7 +49,6 @@ default_attributes(
     :tile_parent => "moscow.render.openstreetmap.org",
     :tile_siblings => [
       "trogdor.openstreetmap.org",
-      "fume.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "nepomuk.openstreetmap.org",

diff --git a/roles/katie.rb b/roles/katie.rb
index 2dc82fc1587b7cbdb0e759dd854dcc86436796ed..445d29f28aef02837371810fa6a54b4fb7872eb4 100644 (file)
--- a/roles/katie.rb
+++ b/roles/katie.rb
@@ -33,7 +33,6 @@ default_attributes(
       "trogdor.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
       "gorynych.openstreetmap.org",
       "simurgh.openstreetmap.org"
     ]

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 6d51f093815b36f12ab23c6fae897e1284bcc877..38a0a461896dba431b91d12a3704c1ee8db9f200 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -33,7 +33,6 @@ default_attributes(
       "trogdor.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
       "gorynych.openstreetmap.org",
       "simurgh.openstreetmap.org"
     ]

diff --git a/roles/lurien.rb b/roles/lurien.rb
index aa0bd353c3d910522798c7a9749a7af484b5d45e..1c0eebdc18360f1a949747544c24b7c08c435d0a 100644 (file)
--- a/roles/lurien.rb
+++ b/roles/lurien.rb
@@ -33,7 +33,6 @@ default_attributes(
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
       "gorynych.openstreetmap.org"
     ]
   }

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 38b4795ba4d765a1d28d6a7933f79f8bace13d42..2874079b16e3cb8e695a875bbfbb87579dbbff84 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -51,7 +51,6 @@ default_attributes(
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
       "gorynych.openstreetmap.org"
     ]
   }

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index e8d1a4ff4c1fdf1fdad07898fb09f1e344f9ad57..a19f77c07baed05b419c38ebd9c2134ada73b032 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -52,7 +52,6 @@ default_attributes(
   :tilecache => {
     :tile_parent => "oslo.render.openstreetmap.org",
     :tile_siblings => [
-      "fume.openstreetmap.org",
       "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
@@ -65,5 +64,6 @@ default_attributes(
 
 run_list(
   "role[blix-no]",
+  "role[geodns]",
   "role[tilecache]"
 )

diff --git a/roles/saphira.rb b/roles/saphira.rb
index 5b83ea7d801bd913032a186ce7d0a9e2aa45f5df..dcb011087ad3b0a4d92c79c75ce610453572ec94 100644 (file)
--- a/roles/saphira.rb
+++ b/roles/saphira.rb
@@ -33,7 +33,6 @@ default_attributes(
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
       "gorynych.openstreetmap.org"
     ]
   }

diff --git a/roles/sarkany.rb b/roles/sarkany.rb
index 30b7afab76d42517af834a775b0e254f286a4ca2..39d8ee28d30e1ba42073639d7e7f4f3a6645f226 100644 (file)
--- a/roles/sarkany.rb
+++ b/roles/sarkany.rb
@@ -33,7 +33,6 @@ default_attributes(
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
       "gorynych.openstreetmap.org"
     ]
   }

diff --git a/roles/simurgh.rb b/roles/simurgh.rb
index 0e9ed4db3cdf397239f2ebc957de58842020e082..645a2236ad3e0252cc610ec981cbd6042dc34de1 100644 (file)
--- a/roles/simurgh.rb
+++ b/roles/simurgh.rb
@@ -23,7 +23,6 @@ default_attributes(
     :tile_siblings => [
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
-      "fume.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "ridgeback.openstreetmap.org",
       "trogdor.openstreetmap.org"

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index 5e7c93a0e9ac348844bfd9337a6b4376afd13211..8119fc03c59b734bd177ba333315a868539f4244 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -34,7 +34,6 @@ default_attributes(
     :tile_siblings => [
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
-      "fume.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "ridgeback.openstreetmap.org",
       "gorynych.openstreetmap.org",