From 6270666074f78834e0df6fc0d0b564124867eef8 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 20 Feb 2018 20:30:02 +0000 Subject: [PATCH] Remove nadder-01 and nadder-02 --- roles/bluehost.rb | 25 --------------------- roles/nadder-01.rb | 56 ---------------------------------------------- roles/nadder-02.rb | 56 ---------------------------------------------- 3 files changed, 137 deletions(-) delete mode 100644 roles/bluehost.rb delete mode 100644 roles/nadder-01.rb delete mode 100644 roles/nadder-02.rb diff --git a/roles/bluehost.rb b/roles/bluehost.rb deleted file mode 100644 index abcf3fd5e..000000000 --- a/roles/bluehost.rb +++ /dev/null @@ -1,25 +0,0 @@ -name "bluehost" -description "Role applied to all servers at Bluehost" - -default_attributes( - :hosted_by => "Bluehost", - :location => "Provo, Utah", - :networking => { - :nameservers => ["8.8.8.8", "8.8.4.4"], - :roles => { - :external => { - :zone => "bh" - } - } - } -) - -override_attributes( - :ntp => { - :servers => ["ntp.bluehost.com"] - } -) - -run_list( - "role[us]" -) diff --git a/roles/nadder-01.rb b/roles/nadder-01.rb deleted file mode 100644 index d1e3760a1..000000000 --- a/roles/nadder-01.rb +++ /dev/null @@ -1,56 +0,0 @@ -name "nadder-01" -description "Master role applied to nadder-01" - -default_attributes( - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "eth0", - :role => :external, - :family => :inet, - :address => "192.163.219.36", - :prefix => "19", - :gateway => "192.163.192.1" - } - } - }, - :sysctl => { - :kvm => { - :comment => "Tuning for KVM guest", - :parameters => { - "kernel.sched_min_granularity_ns" => 10000000, - "kernel.sched_wakeup_granularity_ns" => 15000000 - } - } - }, - :sysfs => { - :hdd_tune => { - :comment => "Tune the queue for improved performance", - :parameters => { - "block/vda/queue/nr_requests" => "128", - "block/vdb/queue/nr_requests" => "128", - "block/vda/queue/scheduler" => "deadline", - "block/vdb/queue/scheduler" => "deadline" - } - } - }, - :squid => { - :cache_mem => "6500 MB", - :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80" - }, - :tilecache => { - :tile_parent => "provo.render.openstreetmap.org", - :tile_siblings => [ - "nadder-02.openstreetmap.org", - "stormfly-02.openstreetmap.org", - "jakelong.openstreetmap.org", - "nepomuk.openstreetmap.org", - "lurien.openstreetmap.org" - ] - } -) - -run_list( - "role[bluehost]", - "role[tilecache]" -) diff --git a/roles/nadder-02.rb b/roles/nadder-02.rb deleted file mode 100644 index e1343c61a..000000000 --- a/roles/nadder-02.rb +++ /dev/null @@ -1,56 +0,0 @@ -name "nadder-02" -description "Master role applied to nadder-02" - -default_attributes( - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "eth0", - :role => :external, - :family => :inet, - :address => "192.163.219.40", - :prefix => "19", - :gateway => "192.163.192.1" - } - } - }, - :sysctl => { - :kvm => { - :comment => "Tuning for KVM guest", - :parameters => { - "kernel.sched_min_granularity_ns" => 10000000, - "kernel.sched_wakeup_granularity_ns" => 15000000 - } - } - }, - :sysfs => { - :hdd_tune => { - :comment => "Tune the queue for improved performance", - :parameters => { - "block/vda/queue/nr_requests" => "128", - "block/vdb/queue/nr_requests" => "128", - "block/vda/queue/scheduler" => "deadline", - "block/vdb/queue/scheduler" => "deadline" - } - } - }, - :squid => { - :cache_mem => "6500 MB", - :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80" - }, - :tilecache => { - :tile_parent => "provo.render.openstreetmap.org", - :tile_siblings => [ - "nadder-01.openstreetmap.org", - "stormfly-02.openstreetmap.org", - "jakelong.openstreetmap.org", - "nepomuk.openstreetmap.org", - "lurien.openstreetmap.org" - ] - } -) - -run_list( - "role[bluehost]", - "role[tilecache]" -) -- 2.43.2