From: Tom Hughes Date: Tue, 3 Nov 2020 19:03:28 +0000 (+0000) Subject: Remove roles for some defunct machines X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/44d0269a5671fffb9f8d0524f98025e0c3f57366 Remove roles for some defunct machines --- diff --git a/roles/delta.rb b/roles/delta.rb deleted file mode 100644 index 247cbda89..000000000 --- a/roles/delta.rb +++ /dev/null @@ -1,17 +0,0 @@ -name "delta" -description "Role applied to all servers at Delta Telecom" - -default_attributes( - :hosted_by => "Delta Telecom", - :location => "Baku, Azerbaijan" -) - -override_attributes( - :ntp => { - :servers => ["0.az.pool.ntp.org", "1.az.pool.ntp.org", "europe.pool.ntp.org"] - } -) - -run_list( - "role[az]" -) diff --git a/roles/euserv.rb b/roles/euserv.rb deleted file mode 100644 index 3270de618..000000000 --- a/roles/euserv.rb +++ /dev/null @@ -1,20 +0,0 @@ -name "euserv" -description "Role applied to all servers at EUserv" - -default_attributes( - :hosted_by => "EUserv", - :location => "Jena, Germany" -) - -override_attributes( - :networking => { - :nameservers => ["85.31.184.60", "85.31.184.61", "85.31.185.60", "85.31.185.61"] - }, - :ntp => { - :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"] - } -) - -run_list( - "role[de]" -) diff --git a/roles/kokosnuss.rb b/roles/kokosnuss.rb deleted file mode 100644 index cebe596df..000000000 --- a/roles/kokosnuss.rb +++ /dev/null @@ -1,41 +0,0 @@ -name "kokosnuss" -description "Master role applied to kokosnuss" - -default_attributes( - :hardware => { - :shm_size => "12g" - }, - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "venet0", - :role => :external, - :family => :inet, - :address => "85.214.255.86", - :prefix => "32", - :gateway => "85.214.255.86" - } - }, - :wireguard => { - :enabled => false - } - }, - :squid => { - :version => 4, - :cache_mem => "8192 MB", - :cache_dir => [ - "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] - }, - :tilecache => { - :tile_parent => "germany.render.openstreetmap.org" - } -) - -run_list( - "role[strato]", - "role[tilecache]" -) diff --git a/roles/konqi.rb b/roles/konqi.rb deleted file mode 100644 index 6744ee3ce..000000000 --- a/roles/konqi.rb +++ /dev/null @@ -1,49 +0,0 @@ -name "konqi" -description "Master role applied to konqi" - -default_attributes( - :hardware => { - :shm_size => "20g" - }, - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "eth0", - :role => :external, - :family => :inet, - :address => "81.7.11.83", - :prefix => "24", - :gateway => "81.7.11.1" - }, - :external_ipv6 => { - :interface => "eth0", - :role => :external, - :family => :inet6, - :address => "2a02:180:1:1::517:b53", - :prefix => "64", - :gateway => "2a02:180:1:1::1" - } - }, - :wireguard => { - :enabled => false - } - }, - :squid => { - :version => 4, - :cache_mem => "16384 MB", - :cache_dir => [ - "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] - }, - :tilecache => { - :tile_parent => "germany.render.openstreetmap.org" - } -) - -run_list( - "role[euserv]", - "role[tilecache]" -) diff --git a/roles/ovh.rb b/roles/ovh.rb deleted file mode 100644 index f8391a2aa..000000000 --- a/roles/ovh.rb +++ /dev/null @@ -1,20 +0,0 @@ -name "ovh" -description "Role applied to all servers at OVH" - -default_attributes( - :hosted_by => "OVH", - :location => "Roubaix, France" -) - -override_attributes( - :networking => { - :nameservers => ["213.186.33.99"] - }, - :ntp => { - :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"] - } -) - -run_list( - "role[fr]" -) diff --git a/roles/scorch.rb b/roles/scorch.rb deleted file mode 100644 index 876fb6905..000000000 --- a/roles/scorch.rb +++ /dev/null @@ -1,79 +0,0 @@ -name "scorch" -description "Master role applied to scorch" - -default_attributes( - :devices => { - :ssd_system => { - :comment => "Tune scheduler for system disk", - :type => "block", - :bus => "scsi", - :serial => "3600605b009bbf5601fc3206407a43546", - :attrs => { - "queue/scheduler" => "noop", - "queue/nr_requests" => "256", - "queue/read_ahead_kb" => "2048" - } - } - }, - :hardware => { - :mcelog => { - :enabled => false - } - }, - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "eth0", - :role => :external, - :family => :inet, - :address => "176.31.235.79", - :prefix => "24", - :gateway => "176.31.235.254" - }, - :external_ipv6 => { - :interface => "eth0", - :role => :external, - :family => :inet6, - :address => "2001:41d0:2:fc4f::1", - :prefix => "64", - :gateway => "2001:41d0:2:fcff:ff:ff:ff:ff" - } - } - }, - :postgresql => { - :settings => { - :defaults => { - :shared_buffers => "8GB", - :maintenance_work_mem => "7144MB", - :effective_cache_size => "16GB" - } - } - }, - :sysctl => { - :postgres => { - :comment => "Increase shared memory for postgres", - :parameters => { - "kernel.shmmax" => 9 * 1024 * 1024 * 1024, - "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 - } - } - }, - :tile => { - :database => { - :cluster => "12/main", - :postgis => "3" - }, - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } - } -) - -run_list( - "role[ovh]", - "role[tile]" -) diff --git a/roles/simurgh.rb b/roles/simurgh.rb deleted file mode 100644 index 011afdce4..000000000 --- a/roles/simurgh.rb +++ /dev/null @@ -1,49 +0,0 @@ -name "simurgh" -description "Master role applied to simurgh" - -default_attributes( - :hardware => { - :shm_size => "18g" - }, - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "ens32", - :role => :external, - :family => :inet, - :address => "94.20.20.55", - :prefix => "24", - :gateway => "94.20.20.1" - } - }, - :wireguard => { - :enabled => false - } - }, - :squid => { - :version => 4, - :cache_mem => "16384 MB", - :cache_dir => [ - "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] - }, - :nginx => { - :cache => { - :proxy => { - :keys_zone => "proxy_cache_zone:64M", - :max_size => "2048M" - } - } - }, - :tilecache => { - :tile_parent => "baku.render.openstreetmap.org" - } -) - -run_list( - "role[delta]", - "role[tilecache]" -) diff --git a/roles/strato.rb b/roles/strato.rb deleted file mode 100644 index 5cf4445dc..000000000 --- a/roles/strato.rb +++ /dev/null @@ -1,20 +0,0 @@ -name "strato" -description "Role applied to all servers at Strato" - -default_attributes( - :hosted_by => "Strato", - :location => "Germany" -) - -override_attributes( - :networking => { - :nameservers => ["85.214.7.22", "81.169.163.106"] - }, - :ntp => { - :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"] - } -) - -run_list( - "role[de]" -)