X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ba1ebf773fd90cb0480e6f79ef6ba2001f039c51..e4c6d76e390af1c5e8fec867f720b3ddebff8b68:/roles/karm.rb?ds=inline diff --git a/roles/karm.rb b/roles/karm.rb index d7d0d2a1e..ffad6d2ee 100644 --- a/roles/karm.rb +++ b/roles/karm.rb @@ -2,12 +2,6 @@ name "karm" description "Master role applied to karm" default_attributes( - :apt => { - :sources => ["postgresql"] - }, - :db => { - :cluster => "9.5/main" - }, :networking => { :interfaces => { :internal_ipv4 => { @@ -16,7 +10,7 @@ default_attributes( :family => :inet, :address => "10.0.48.50", :bond => { - :slaves => %w[enp1s0f0 enp1s0f1] + :slaves => %w[enp1s0f0 enp1s0f1 enp2s0f0 enp2s0f1] } } } @@ -41,25 +35,10 @@ default_attributes( "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096 } } - }, - :sysfs => { - :md_tune => { - :comment => "Enable request merging for NVMe devices", - :parameters => { - "block/nvme0n1/queue/nomerges" => "1", - "block/nvme1n1/queue/nomerges" => "1", - "block/nvme2n1/queue/nomerges" => "1", - "block/nvme3n1/queue/nomerges" => "1", - "block/nvme4n1/queue/nomerges" => "1", - "block/nvme5n1/queue/nomerges" => "1", - "block/nvme6n1/queue/nomerges" => "1", - "block/nvme7n1/queue/nomerges" => "1" - } - } } ) run_list( - "role[equinix]", + "role[equinix-ams]", "role[db-slave]" )