Merge branch 'brodock/refactor-patroni-default-attributes' into 'master'

Reorganize default attributes

See merge request gitlab-org/omnibus-gitlab!4569

files/gitlab-cookbooks/patroni/attributes/default.rb

 default['patroni']['enable'] = false
-
 default['patroni']['dir'] = '/var/opt/gitlab/patroni'
 default['patroni']['data_dir'] = '/var/opt/gitlab/patroni/data'
-default['patroni']['scope'] = 'postgresql-ha'
-default['patroni']['name'] = node.name
-
-default['patroni']['log_directory'] = '/var/log/gitlab/patroni'
-default['patroni']['log_level'] = 'INFO'
-
-default['patroni']['consul']['url'] = 'http://127.0.0.1:8500'
-default['patroni']['consul']['service_check_interval'] = '10s'
-default['patroni']['consul']['register_service'] = true
-default['patroni']['consul']['checks'] = []
+#
+# Settings below are based on https://patroni.readthedocs.io/en/latest/SETTINGS.html#settings
+#
+# Patroni dynamic configuration settings
 default['patroni']['loop_wait'] = 10
 default['patroni']['ttl'] = 30
 default['patroni']['retry_timeout'] = 10
@@ -24,6 +17,21 @@ default['patroni']['use_pg_rewind'] = false
 default['patroni']['use_slots'] = true
 default['patroni']['replication_slots'] = {}
+# Global/Universal settings
+default['patroni']['name'] = node.name
+default['patroni']['scope'] = 'postgresql-ha'
+
+# Log settings
+default['patroni']['log_directory'] = '/var/log/gitlab/patroni'
+default['patroni']['log_level'] = 'INFO'
+
+# Consul specific settings
+default['patroni']['consul']['url'] = 'http://127.0.0.1:8500'
+default['patroni']['consul']['service_check_interval'] = '10s'
+default['patroni']['consul']['register_service'] = true
+default['patroni']['consul']['checks'] = []
+
+# PostgreSQL specific settings
 default['patroni']['postgresql']['wal_level'] = 'replica'
 default['patroni']['postgresql']['hot_standby'] = 'on'
 default['patroni']['postgresql']['wal_keep_segments'] = 8
@@ -31,6 +39,7 @@ default['patroni']['postgresql']['max_wal_senders'] = 5
 default['patroni']['postgresql']['max_replication_slots'] = 5
 default['patroni']['postgresql']['checkpoint_timeout'] = 30
+# Rest API settings
 default['patroni']['listen_address'] = nil
 default['patroni']['connect_address'] = nil
 default['patroni']['port'] = '8008'