From fe0c3cd23523cd1e596c1cab048fdf2c9e19865e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 23 Feb 2016 09:24:49 +0000 Subject: [PATCH 1/1] Remove fume and provision geodns on ridgeback --- roles/cmok.rb | 1 - roles/fume.rb | 63 ---------------------------------------------- roles/gorynych.rb | 1 - roles/katie.rb | 1 - roles/konqi.rb | 1 - roles/lurien.rb | 1 - roles/nepomuk.rb | 1 - roles/ridgeback.rb | 2 +- roles/saphira.rb | 1 - roles/sarkany.rb | 1 - roles/simurgh.rb | 1 - roles/trogdor.rb | 1 - 12 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 roles/fume.rb diff --git a/roles/cmok.rb b/roles/cmok.rb index 1cbe31d57..07057adfa 100644 --- 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 index 88b23ab70..000000000 --- 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 101e9d083..597951828 100644 --- 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 2dc82fc15..445d29f28 100644 --- 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 6d51f0938..38a0a4618 100644 --- 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 aa0bd353c..1c0eebdc1 100644 --- 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 38b4795ba..2874079b1 100644 --- 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 e8d1a4ff4..a19f77c07 100644 --- 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 5b83ea7d8..dcb011087 100644 --- 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 30b7afab7..39d8ee28d 100644 --- 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 0e9ed4db3..645a2236a 100644 --- 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 5e7c93a0e..8119fc03c 100644 --- 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", -- 2.43.2