X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/95131f239516b43febc32bfa86fdb24ce1821a09..5bbe6932cd6068a287a109cf811c075ab7d3bb47:/roles/odin.rb?ds=sidebyside diff --git a/roles/odin.rb b/roles/odin.rb index 32791077d..b0c497647 100644 --- a/roles/odin.rb +++ b/roles/odin.rb @@ -2,9 +2,6 @@ name "odin" description "Master role applied to odin" default_attributes( - :apt => { - :sources => ["postgresql"] - }, :networking => { :interfaces => { :internal_ipv4 => { @@ -31,7 +28,6 @@ default_attributes( } }, :postgresql => { - :versions => ["10"], :settings => { :defaults => { :shared_buffers => "8GB", @@ -49,21 +45,12 @@ default_attributes( } } }, - :sysfs => { - :md_tune => { - :comment => "Enable request merging for NVMe devices", - :parameters => { - "block/nvme0n1/queue/nomerges" => "1", - "block/nvme1n1/queue/nomerges" => "1" - } - } - }, :tile => { :database => { - :cluster => "10/main", - :postgis => "2.4" + :cluster => "14/main", + :postgis => "3" }, - :node_file => "/store/database/nodes", + :mapnik => "3.1", :styles => { :default => { :tile_directories => [ @@ -75,6 +62,6 @@ default_attributes( ) run_list( - "role[equinix]", + "role[equinix-ams]", "role[tile]" )