X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7492d715cd8f39607b2d203eccda5101586e1e17..af87a58d387f200266eb7717f15c54f2a94cc284:/roles/katla.rb?ds=inline diff --git a/roles/katla.rb b/roles/katla.rb index 194b139b6..6143cf533 100644 --- a/roles/katla.rb +++ b/roles/katla.rb @@ -2,12 +2,6 @@ name "katla" description "Master role applied to katla" default_attributes( - :apt => { - :sources => ["postgresql"] - }, - :db => { - :cluster => "9.5/main" - }, :devices => { :store_slow => { :comment => "RAID array mounted on /store/arrays/slow", @@ -74,13 +68,6 @@ default_attributes( } }, :sysctl => { - :ipv6_autoconf => { - :comment => "Disable IPv6 auto-configuration on internal interface", - :parameters => { - "net.ipv6.conf.bond0.autoconf" => "0", - "net.ipv6.conf.bond0.accept_ra" => "0" - } - }, :postgres => { :comment => "Increase shared memory for postgres", :parameters => { @@ -93,6 +80,5 @@ default_attributes( run_list( "role[bytemark]", - "role[db-master]", - "role[db-backup]" + "role[db-slave]" )